Skip to content

Commit 1402020

Browse files
lgritzscott-wilson
authored andcommitted
ci: Upgrade to newer actions (AcademySoftwareFoundation#4570)
* Upgrade upload-artifact action, old one is being deprecated. * Update checkout and cache actions to latest. * Fix workflow warning: save-always is not really an input to actions/cache. Signed-off-by: Larry Gritz <[email protected]> Signed-off-by: Scott Wilson <[email protected]>
1 parent eb9d0d7 commit 1402020

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

.github/workflows/build-steps.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,7 @@ jobs:
9595
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
9696

9797
steps:
98-
# - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
99-
# # Note: can't upgrade to actions/checkout 4.0 because it needs newer
100-
# # glibc than these containers have.
101-
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
98+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
10299
with:
103100
fetch-depth: '0'
104101
- name: Prepare ccache timestamp
@@ -107,14 +104,11 @@ jobs:
107104
run: echo "date=`date -u +'%Y-%m-%dT%H:%M:%SZ'`" >> $GITHUB_OUTPUT
108105
- name: ccache
109106
id: ccache
110-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
111-
# Note: can't upgrade to actions/cache 4.0 because it needs newer
112-
# glibc than these containers have.
107+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
113108
with:
114109
path: ./ccache
115110
key: ${{github.job}}-${{inputs.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
116111
restore-keys: ${{github.job}}-
117-
save-always: true
118112
- name: Setup Nuget.exe (Windows only)
119113
if: runner.os == 'Windows'
120114
uses: nuget/setup-nuget@a21f25cd3998bf370fde17e3f1b4c12c175172f9 # v2.0.0
@@ -163,7 +157,7 @@ jobs:
163157
# Consult https://docs.sonarcloud.io/advanced-setup/ci-based-analysis/sonarscanner-cli/ for more information and options
164158
- name: Check out ABI standard
165159
if: inputs.abi_check != ''
166-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
160+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
167161
with:
168162
ref: ${{inputs.abi_check}}
169163
path: abi_standard
@@ -187,9 +181,7 @@ jobs:
187181
cd src/doc
188182
time make doxygen
189183
time make sphinx
190-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
191-
# Note: versions of upload-artifact >= 4.0 can't run on the ASWF
192-
# containers because they need a newer glibc than they have.
184+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
193185
if: ${{ failure() || inputs.build_docs == '1'}}
194186
with:
195187
name: oiio-${{github.job}}-${{inputs.nametag}}

.github/workflows/ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,15 @@ jobs:
169169
# uses: step-security/harden-runner@248ae51c2e8cc9622ecf50685c8bf7150c6e8813 # v1.4.3
170170
# with:
171171
# egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
172-
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
173-
# Note: can't upgrade to actions/checkout 4.0 because it needs newer
174-
# glibc than these containers have.
172+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
173+
with:
174+
fetch-depth: '0'
175175
- name: Prepare ccache timestamp
176176
id: ccache_cache_keys
177177
run: echo "date=`date -u +'%Y-%m-%dT%H:%M:%SZ'`" >> $GITHUB_OUTPUT
178178
- name: ccache
179179
id: ccache
180-
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
181-
# Note: can't upgrade to actions/cache 4.0 because it needs newer
182-
# glibc than these containers have.
180+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
183181
with:
184182
path: /tmp/ccache
185183
key: ${{github.job}}-${{matrix.nametag}}-${{steps.ccache_cache_keys.outputs.date}}
@@ -200,7 +198,7 @@ jobs:
200198
run: src/build-scripts/ci-test.bash
201199
- name: Check out ABI standard
202200
if: matrix.abi_check != ''
203-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
201+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
204202
with:
205203
ref: ${{matrix.abi_check}}
206204
path: abi_standard
@@ -221,9 +219,7 @@ jobs:
221219
cd src/doc
222220
time make doxygen
223221
time make sphinx
224-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
225-
# Note: versions of upload-artifact >= 4.0 can't run on the ASWF
226-
# containers because they need a newer glibc than they have.
222+
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
227223
if: ${{ failure() || matrix.build_docs == '1'}}
228224
with:
229225
name: oiio-${{github.job}}-${{matrix.nametag}}

.github/workflows/scorecard.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ jobs:
4747

4848
steps:
4949
- name: "Checkout code"
50-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
50+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5151
with:
5252
persist-credentials: false
53+
fetch-depth: '0'
5354

5455
- name: "Run analysis"
5556
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1

0 commit comments

Comments
 (0)