Skip to content
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

Update workflows #2268

Merged
merged 3 commits into from
Apr 17, 2024
+6 −3
Merged

Update workflows #2268

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bcd30d
Update workflows
jwrober Apr 5, 2024
1f76357
Remove the branches since releases are not on a branch
jwrober Apr 8, 2024
c8646f4
remove ineffective workflow as per review
jwrober Apr 14, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
run: |
cmake --build build --target package
- name: Upload package
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: |
startsWith(github.ref, 'refs/tags/')
&& matrix.compiler == 'gcc'
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
run: |
cmake --build build --target package
- name: Upload package
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Expand Down Expand Up @@ -283,7 +283,7 @@ jobs:
"staging/"
shasum -a 256 Freeciv21-${{steps.split.outputs.fragment}}.dmg > Freeciv21-${{steps.split.outputs.fragment}}.dmg.sha256
- name: Upload package
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
schedule:
- cron: "0 5 * * MON"
workflow_dispatch: {}
workflow_run:
workflows: ["Build"]
types:
- completed
jwrober marked this conversation as resolved.
Show resolved Hide resolved

jobs:
update-autorevision:
Expand Down Expand Up @@ -50,6 +54,9 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- # Make sure there are no unstaged changes
# Was reporting changes to eol=crlf files in .gitattributes
run: git checkout -- .
- run: git rev-parse --short=5 HEAD > cmake/AutoRevision.txt
- run: git describe --tags `git rev-list --tags --max-count=1` >> cmake/AutoRevision.txt
- run: cat cmake/AutoRevision.txt
Expand Down
Loading