Skip to content

Commit ec0c6d4

Browse files
cmsjcmsj
committed
Various updates to github workflows and CI scripts, because they were very stale
1 parent f282812 commit ec0c6d4

File tree

5 files changed

+26
-24
lines changed

5 files changed

+26
-24
lines changed

‎.github/workflows/ci_nightly.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838
with:
3939
xcode-version: 15.3
4040
- name: Checkout Hammerspoon Code
41-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
4242
with:
4343
fetch-depth: 0
4444
- name: Checkout Hammerspoon Secrets
45-
uses: actions/checkout@v2
45+
uses: actions/checkout@v4
4646
with:
4747
repository: Hammerspoon/ci-secrets
4848
path: ./ci-secrets
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Upload build log on failure
8383
if: failure()
84-
uses: actions/upload-artifact@v2
84+
uses: actions/upload-artifact@v4
8585
with:
8686
name: nightly-build.log
8787
path: build/Release-build.log
@@ -100,7 +100,7 @@ jobs:
100100
echo "${{ steps.release_notes_generator.outputs.changelog }}" >release_notes.txt
101101
- name: Upload Release Notes
102102
id: upload_release_notes
103-
uses: actions/upload-artifact@v2
103+
uses: actions/upload-artifact@v4
104104
with:
105105
name: Release_Notes-${{ steps.version.outputs.NIGHTLY_VERSION }}.txt
106106
path: release_notes.txt
@@ -109,28 +109,28 @@ jobs:
109109
run: mv ../archive ./ ; find ./archive
110110

111111
- name: Upload artifacts App bundle
112-
uses: actions/upload-artifact@v2
112+
uses: actions/upload-artifact@v4
113113
with:
114114
name: Hammerspoon.app-${{ steps.version.outputs.NIGHTLY_VERSION }}.zip
115115
path: archive/${{ steps.version.outputs.NIGHTLY_VERSION }}/Hammerspoon.app-${{ steps.version.outputs.NIGHTLY_VERSION }}.zip
116116
- name: Upload artifacts Debug symbols
117-
uses: actions/upload-artifact@v2
117+
uses: actions/upload-artifact@v4
118118
with:
119119
name: dSYM-${{ steps.version.outputs.NIGHTLY_VERSION }}.zip
120120
path: archive/${{ steps.version.outputs.NIGHTLY_VERSION }}/Hammerspoon-dSYM-${{ steps.version.outputs.NIGHTLY_VERSION }}.zip
121121
- name: Upload artifacts HTML docs
122-
uses: actions/upload-artifact@v2
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: docs-${{ steps.version.outputs.NIGHTLY_VERSION }}.zip
125125
path: archive/${{ steps.version.outputs.NIGHTLY_VERSION }}/docs/${{ steps.version.outputs.NIGHTLY_VERSION }}-docs.zip
126126
- name: Upload artifacts docs json
127-
uses: actions/upload-artifact@v2
127+
uses: actions/upload-artifact@v4
128128
with:
129129
name: docs-${{ steps.version.outputs.NIGHTLY_VERSION }}.json
130130
path: archive/${{ steps.version.outputs.NIGHTLY_VERSION }}/docs/docs.json
131131

132132
- name: Upload artifacts Build log
133-
uses: actions/upload-artifact@v2
133+
uses: actions/upload-artifact@v4
134134
with:
135135
name: Release-build.log
136136
path: archive/${{ steps.version.outputs.NIGHTLY_VERSION }}/Release-build.log

‎.github/workflows/ci_testbuild.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
xcode-version: 15.4
2222
- name: Checkout
23-
uses: actions/checkout@v2
23+
uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
2626

@@ -31,7 +31,7 @@ jobs:
3131
run: ./scripts/github-ci-docs.sh
3232
- name: Upload artifacts (docstrings lint annotations)
3333
if: always()
34-
uses: actions/upload-artifact@v2
34+
uses: actions/upload-artifact@v4
3535
with:
3636
name: annotations.json
3737
path: build/annotations.json
@@ -40,7 +40,7 @@ jobs:
4040
run: ./scripts/github-ci-testbuild.sh
4141
- name: Upload artifacts
4242
if: always()
43-
uses: actions/upload-artifact@v2
43+
uses: actions/upload-artifact@v4
4444
with:
4545
name: build.log
4646
path: artifacts/build.log
@@ -50,20 +50,22 @@ jobs:
5050
run: ./scripts/github-ci-test.sh
5151

5252
- name: Upload test coverage
53-
uses: codecov/codecov-action@v1
53+
uses: codecov/codecov-action@v4
5454
with:
55-
verbose: true
55+
verbose: false
56+
token: ${{ secrets.CODECOV_TOKEN }}
57+
files: ./build/reports/junit.xml
5658
if: always()
5759

5860
- name: Upload artifacts (test log)
5961
if: always()
60-
uses: actions/upload-artifact@v2
62+
uses: actions/upload-artifact@v4
6163
with:
6264
name: test.log
6365
path: artifacts/test.log
6466
- name: Upload artifacts (test results)
6567
if: always()
66-
uses: actions/upload-artifact@v2
68+
uses: actions/upload-artifact@v4
6769
with:
6870
name: test_results
6971
path: build/reports/junit.xml

‎.github/workflows/generate_release_notes.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout Hammerspoon Code
14-
uses: actions/checkout@v2
14+
uses: actions/checkout@v4
1515
with:
1616
fetch-depth: 0
1717
- name: Generate Release Notes
@@ -28,7 +28,7 @@ jobs:
2828
echo "${{ steps.release_notes_generator.outputs.changelog }}" >release_notes.txt
2929
- name: Upload Release Notes
3030
id: upload_release_notes
31-
uses: actions/upload-artifact@v2
31+
uses: actions/upload-artifact@v4
3232
with:
3333
name: Release_Notes.txt
3434
path: release_notes.txt

‎.github/workflows/new_tag.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
contents: write
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
- name: Get current tag name
@@ -39,7 +39,7 @@ jobs:
3939
run: |
4040
echo "${{ steps.generate.outputs.changelog }}" >releasenotes.md
4141
- name: Upload as artifact
42-
uses: actions/upload-artifact@v2
42+
uses: actions/upload-artifact@v4
4343
with:
4444
name: ${{ steps.date.outputs.date}}-${{ steps.tag.outputs.tag }}.md
4545
path: releasenotes.md
@@ -59,7 +59,7 @@ jobs:
5959
issues: write
6060
needs: generate-release-notes
6161
steps:
62-
- uses: actions/checkout@v2
62+
- uses: actions/checkout@v4
6363
with:
6464
fetch-depth: 0
6565

‎scripts/github-ci-test.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ mv build/reports/*.xml build/reports/junit.xml
2626

2727
RESULT=$(grep -A1 "Test Suite 'All tests'" artifacts/test.log | tail -1 | sed -e 's/^[ ]+//')
2828

29-
echo "::set-output name=test_result::${RESULT}"
29+
echo "test_result=${RESULT}" >> $GITHUB_OUTPUT
3030

3131
if [[ "${RESULT}" == *"0 failures"* ]]; then
32-
echo "::set-output name=test_result_short::Passed"
32+
echo "test_result_short=Passed" >> $GITHUB_OUTPUT
3333
exit 0
3434
else
35-
echo "::set-output name=test_result_short::Failed"
35+
echo "test_result_short=Failed" >> $GITHUB_OUTPUT
3636
exit 1
3737
fi

0 commit comments

Comments
 (0)