Skip to content

create new release v2.6.x and merge it main branch #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
noneandundefined merged 6 commits into from
May 13, 2025
Merged

create new release v2.6.x and merge it main branch #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1040ece
the 'update-windows-auto-commit.ps1' file has been changed | the 'ins…
noneandundefined May 13, 2025
146c20a
the 'release.yml' file has been changed | the 'install-windows-auto-c…
noneandundefined May 13, 2025
26d355d
the 'install-windows-auto-commit.ps1' file has been changed
noneandundefined May 13, 2025
b73ba9b
the 'install-windows-auto-commit.ps1' file has been changed
noneandundefined May 13, 2025
907b28c
the 'update-windows-auto-commit.ps1' file has been changed
noneandundefined May 13, 2025
e6a2853
the 'Makefile' file has been changed
noneandundefined May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ jobs:
with:
go-version: '1.23.0'

- name: Build auto-commit binary
- name: Build auto-commit binary (Windows)
run: |
GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -trimpath -o ./bin/auto-commit-win .
upx --best --lzma ./bin/auto-commit-win

- name: Build auto-commit binary (Linux)
run: |
sudo apt-get update && sudo apt-get install upx -y
go build -ldflags="-s -w" -trimpath -o ./bin/auto-commit .
Expand Down Expand Up @@ -205,6 +210,7 @@ jobs:
[©thefuture-industries](https://github.com/thefuture-industries)
files: |
./bin/auto-commit
./bin/auto-commit-win
./scripts/install-linux-auto-commit.sh
./scripts/install-windows-auto-commit.ps1
./scripts/update-windows-auto-commit.ps1
Expand Down
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ build:
@go build -o bin/auto-commit .

buildrelease:
@echo "Running release build..."
@echo "Running release build (windows, linux)..."

@go build -ldflags="-s -w" -trimpath -o bin/auto-commit .
@upx.exe --best --lzma bin/auto-commit

@GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -trimpath -o bin/auto-commit-linux .
@upx.exe --best --lzma bin/auto-commit-linux

buildrelease-update:
@echo "Running release build update..."
@go build -ldflags="-s -w" -trimpath -o bin/auto-commit.update .
Expand Down
4 changes: 2 additions & 2 deletions scripts/install-windows-auto-commit.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $HookName = "auto-commit"

$versionUrl = "https://api.github.com/repos/thefuture-industries/git-auto-commit/releases/latest"
$tag = (Invoke-RestMethod -Uri $versionUrl -UseBasicParsing).tag_name
$Url = "https://github.com/thefuture-industries/git-auto-commit/releases/download/$tag/auto-commit"
$Url = "https://github.com/thefuture-industries/git-auto-commit/releases/download/$tag/auto-commit-win"

if (-not (Test-Path ".git/hooks")) {
Write-Error "The current directory is not a Git repository."
Expand All @@ -39,7 +39,7 @@ try {
Invoke-WebRequest -Uri $Url -OutFile $hookPath -UseBasicParsing
Write-Host "File saved as $hookPath" -ForegroundColor Yellow

git config --local alias.auto '!./.git/hooks/auto-commit'
git config --local alias.auto '!powershell -c ./.git/hooks/auto-commit'

$versionFile = Join-Path -Path ".git/hooks" -ChildPath "auto-commit.version.txt"
Set-Content -Path $versionFile -Value $tag
Expand Down
5 changes: 3 additions & 2 deletions scripts/update-windows-auto-commit.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if ($proc) {
$versionUrl = "https://api.github.com/repos/thefuture-industries/git-auto-commit/releases/latest"
$tag = (Invoke-RestMethod -Uri $versionUrl -UseBasicParsing).tag_name

$Url = "https://github.com/thefuture-industries/git-auto-commit/releases/download/$tag/auto-commit"
$Url = "https://github.com/thefuture-industries/git-auto-commit/releases/download/$tag/auto-commit-win"

$HookName = "auto-commit"
$hookPath = Join-Path -Path ".git/hooks" -ChildPath $HookName
Expand Down Expand Up @@ -64,7 +64,8 @@ Download-WithProgress -url $Url -output $hookPath

Set-Content -Path $versionFile -Value $tag

git config --local alias.auto '!./.git/hooks/auto-commit'
# git config --local alias.auto '!./.git/hooks/auto-commit'
git config --local alias.auto '!powershell -c ./.git/hooks/auto-commit'

Write-Host "successful upgrade to version $tag"
exit 0