Skip to content

Commit

Permalink
Merge working branch into stable for release
Browse files Browse the repository at this point in the history
  • Loading branch information
TcM1911 committed Oct 12, 2024
2 parents 01b71a6 + 4ce24d8 commit fe38d96
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 573 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ name: Main
on:
push:
branches:
- master
- develop
- master
- develop
tags:
- '*'
- '*'

jobs:
CI:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0 # Needed for "git describe"

- name: Set up Go
uses: actions/setup-go@v5
Expand All @@ -27,6 +29,6 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
VER=$(git describe --tags --abbrev=0 | awk -F. -v OFS=. '{$NF += 1 ; print}')
VER=$(git describe --tags --abbrev=0)
gh release create --verify-tag --generate-notes $VER ./dist/*
7 changes: 5 additions & 2 deletions .github/workflows/gore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: "master" # Always run off the stable branch.
ref: "master" # Always run off the stable branch.
fetch-depth: 0 # Needed for "git describe"

- name: Set up Go
uses: actions/setup-go@v5
Expand All @@ -38,6 +39,8 @@ jobs:
VER=$(git describe --tags --abbrev=0 | awk -F. -v OFS=. '{$NF += 1 ; print}')
git tag $VER
git push --tags
# Build binaries and release
make release && gh release create --verify-tag --generate-notes $VER ./dist/*
else
echo "::notice::No new version."
fi
fi
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/TcM1911/r2g2 v0.3.2
github.com/cheynewallace/tabby v1.1.1
github.com/goretk/gore v0.11.5
github.com/spf13/cobra v1.2.1
github.com/spf13/cobra v1.8.1
)

require (
Expand Down
Loading

0 comments on commit fe38d96

Please sign in to comment.