Skip to content

Commit 6aef258

Browse files
author
Erlang/OTP
committed
Merge branch 'lukas/gh/maint-26' into maint-26
* lukas/gh/maint-26: Update github actions versions # Conflicts: # .github/workflows/main.yaml
2 parents 4806adf + a2371bf commit 6aef258

File tree

8 files changed

+53
-53
lines changed

8 files changed

+53
-53
lines changed

‎.github/actions/build-base-image/action.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ runs:
2020
run: .github/scripts/cleanup_gh_runner.sh
2121

2222
- name: Cache BASE image
23-
uses: actions/[email protected].0
23+
uses: actions/[email protected].2
2424
if: inputs.TYPE == '64-bit' || inputs.TYPE == 'clang'
2525
with:
2626
path: otp_docker_base.tar
2727
key: ${{ runner.os }}-${{ hashFiles('.github/dockerfiles/Dockerfile.ubuntu-base', '.github/scripts/build-base-image.sh') }}-${{ hashFiles('OTP_VERSION') }}
2828

2929
- name: Docker login
30-
uses: docker/login-action@v3.0.0
30+
uses: docker/login-action@v3.1.0
3131
with:
3232
registry: ghcr.io
3333
username: ${{ github.repository_owner }}
@@ -39,13 +39,13 @@ runs:
3939

4040
- name: Cache pre-built src
4141
if: inputs.BUILD_IMAGE == 'true'
42-
uses: actions/[email protected].0
42+
uses: actions/[email protected].2
4343
with:
4444
path: otp_src.tar.gz
4545
key: prebuilt-src-${{ github.ref_name }}-${{ github.sha }}
4646
- name: Cache pre-built binaries
4747
if: inputs.BUILD_IMAGE == 'true'
48-
uses: actions/[email protected].0
48+
uses: actions/[email protected].2
4949
with:
5050
path: otp_cache.tar.gz
5151
key: prebuilt-cache-${{ inputs.TYPE }}-${{ github.ref_name }}-${{ github.sha }}

‎.github/workflows/actions-updater.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ jobs:
1414
steps:
1515
- name: Generate token
1616
id: generate_token
17-
uses: actions/create-github-app-token@v1.7.0
17+
uses: actions/create-github-app-token@v1.9.3
1818
with:
1919
app-id: ${{ secrets.APP_ID }}
2020
private-key: ${{ secrets.APP_PEM }}
2121

22-
- uses: actions/[email protected].1
22+
- uses: actions/[email protected].4
2323
with:
2424
token: ${{ steps.generate_token.outputs.token }}
2525

‎.github/workflows/add-to-project.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ jobs:
1616
steps:
1717
- name: Generate token
1818
id: generate_token
19-
uses: actions/create-github-app-token@v1.7.0
19+
uses: actions/create-github-app-token@v1.9.3
2020
with:
2121
app_id: ${{ secrets.APP_ID }}
2222
private_key: ${{ secrets.APP_PEM }}
2323

24-
- uses: actions/add-to-project@v0.5.0
24+
- uses: actions/add-to-project@v1.0.1
2525
with:
2626
project-url: https://github.com/orgs/erlang/projects/13
2727
github-token: ${{ steps.generate_token.outputs.token }}

‎.github/workflows/main.yaml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
c-code-changes: ${{ steps.c-code-changes.outputs.changes }}
4242
all: ${{ steps.apps.outputs.all }}
4343
steps:
44-
- uses: actions/[email protected].1
44+
- uses: actions/[email protected].4
4545
- uses: ./.github/actions/build-base-image
4646
with:
4747
BASE_BRANCH: ${{ env.BASE_BRANCH }}
@@ -58,7 +58,7 @@ jobs:
5858
ALL_APPS=$(jq -n --arg inarr "${ALL_APPS}" '$inarr | split("\n")' | tr '\n' ' ')
5959
echo "all=${ALL_APPS}" >> $GITHUB_OUTPUT
6060
- name: Check which applications have changed
61-
uses: dorny/[email protected].0
61+
uses: dorny/[email protected].2
6262
id: app-changes
6363
with:
6464
filters: .github/scripts/path-filters.yaml
@@ -79,14 +79,14 @@ jobs:
7979
with:
8080
filters: .github/scripts/c-code-path-filters.yaml
8181
- name: Cache pre-built src
82-
uses: actions/[email protected].0
82+
uses: actions/[email protected].2
8383
with:
8484
path: otp_src.tar.gz
8585
key: prebuilt-src-${{ github.ref_name }}-${{ github.sha }}
8686
restore-keys: |
8787
prebuilt-src-${{ github.base_ref }}-${{ github.event.pull_request.base.sha }}
8888
- name: Cache pre-built binaries
89-
uses: actions/[email protected].0
89+
uses: actions/[email protected].2
9090
with:
9191
path: otp_cache.tar.gz
9292
key: prebuilt-cache-64-bit-${{ github.ref_name }}-${{ github.sha }}
@@ -95,12 +95,12 @@ jobs:
9595
- name: Create initial pre-release tar
9696
run: .github/scripts/init-pre-release.sh otp_archive.tar.gz otp_src.tar.gz
9797
- name: Upload source tar archive
98-
uses: actions/[email protected].0
98+
uses: actions/[email protected].3
9999
with:
100100
name: otp_git_archive
101101
path: otp_archive.tar.gz
102102
- name: Check how we can use the pre-built cache
103-
uses: dorny/[email protected].0
103+
uses: dorny/[email protected].2
104104
id: cache
105105
with:
106106
filters: |
@@ -139,7 +139,7 @@ jobs:
139139
"`pwd`/.github/otp.tar.gz" \
140140
"`pwd`/otp_archive.tar.gz"
141141
- name: Upload restored cache
142-
uses: actions/[email protected].0
142+
uses: actions/[email protected].3
143143
if: runner.debug == 1
144144
with:
145145
name: restored-cache
@@ -166,7 +166,7 @@ jobs:
166166
bash -c 'set -x; C_APPS=$(ls -d ./lib/*/c_src); find Makefile ./make ./erts ./bin/`erts/autoconf/config.guess` ./lib/erl_interface ./lib/jinterface ${C_APPS} `echo "${C_APPS}" | sed -e 's:c_src$:priv:'` -type f -newer README.md \! -name "*.beam" \! -path "*/doc/*" | xargs tar --transform "s:^./:otp/:" -uvf /github/otp_cache.tar'
167167
gzip otp_cache.tar
168168
- name: Upload pre-built tar archives
169-
uses: actions/[email protected].0
169+
uses: actions/[email protected].3
170170
with:
171171
name: otp_prebuilt
172172
path: |
@@ -181,16 +181,16 @@ jobs:
181181
env:
182182
WXWIDGETS_VERSION: 3.1.5
183183
steps:
184-
- uses: actions/[email protected].1
184+
- uses: actions/[email protected].4
185185

186186
- name: Download source archive
187-
uses: actions/[email protected].1
187+
uses: actions/[email protected].7
188188
with:
189189
name: otp_prebuilt
190190

191191
- name: Cache wxWidgets
192192
id: wxwidgets-cache
193-
uses: actions/[email protected].0
193+
uses: actions/[email protected].2
194194
with:
195195
path: wxWidgets
196196
key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-12
@@ -216,7 +216,7 @@ jobs:
216216
./bin/erl -noshell -eval '{wx_ref,_,_,_} = wx:new(), io:format("wx ok~n"), halt().'
217217
218218
- name: Upload tarball
219-
uses: actions/[email protected].0
219+
uses: actions/[email protected].3
220220
with:
221221
name: otp_prebuilt_macos_x86-64
222222
path: otp/otp_macos_*_x86-64.tar.gz
@@ -229,9 +229,9 @@ jobs:
229229
runs-on: macos-12
230230
needs: pack
231231
steps:
232-
- uses: actions/[email protected].1
232+
- uses: actions/[email protected].4
233233
- name: Download source archive
234-
uses: actions/[email protected].1
234+
uses: actions/[email protected].7
235235
with:
236236
name: otp_prebuilt
237237

@@ -250,7 +250,7 @@ jobs:
250250
xcodebuild -create-xcframework -output ./liberlang.xcframework -library liberlang.a
251251
252252
- name: Upload framework
253-
uses: actions/[email protected].0
253+
uses: actions/[email protected].3
254254
with:
255255
name: ios_framework_${{ env.TARGET_ARCH }}
256256
path: otp/liberlang.xcframework
@@ -266,7 +266,7 @@ jobs:
266266
needs: pack
267267
if: needs.pack.outputs.c-code-changes
268268
steps:
269-
- uses: Vampire/setup-wsl@v2.0.2
269+
- uses: Vampire/setup-wsl@v3.0.0
270270
with:
271271
distribution: Ubuntu-18.04
272272

@@ -280,7 +280,7 @@ jobs:
280280
IF EXIST "c:\\Program Files\\OpenSSL-Win64" (move "c:\\Program Files\\OpenSSL-Win64" "c:\\OpenSSL-Win64") ELSE (move "c:\\Program Files\\OpenSSL" "c:\\OpenSSL-Win64")
281281
282282
- name: Cache wxWidgets
283-
uses: actions/[email protected].0
283+
uses: actions/[email protected].2
284284
with:
285285
path: wxWidgets
286286
key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}
@@ -322,7 +322,7 @@ jobs:
322322
nmake TARGET_CPU=amd64 BUILD=release SHARED=0 DIR_SUFFIX_CPU= -f makefile.vc
323323
324324
- name: Download source archive
325-
uses: actions/[email protected].1
325+
uses: actions/[email protected].7
326326
with:
327327
name: otp_prebuilt
328328

@@ -350,7 +350,7 @@ jobs:
350350
./otp_build installer_win32
351351
352352
- name: Upload installer
353-
uses: actions/[email protected].0
353+
uses: actions/[email protected].3
354354
with:
355355
name: otp_win32_installer
356356
path: otp/release/win32/otp*.exe
@@ -362,7 +362,7 @@ jobs:
362362
if: needs.pack.outputs.c-code-changes
363363

364364
steps:
365-
- uses: actions/[email protected].1
365+
- uses: actions/[email protected].4
366366
- uses: ./.github/actions/build-base-image
367367
with:
368368
BASE_BRANCH: ${{ env.BASE_BRANCH }}
@@ -390,7 +390,7 @@ jobs:
390390
fail-fast: false
391391

392392
steps:
393-
- uses: actions/[email protected].1
393+
- uses: actions/[email protected].4
394394
- uses: ./.github/actions/build-base-image
395395
with:
396396
BASE_BRANCH: ${{ env.BASE_BRANCH }}
@@ -401,7 +401,7 @@ jobs:
401401
runs-on: ubuntu-latest
402402
needs: pack
403403
steps:
404-
- uses: actions/[email protected].1
404+
- uses: actions/[email protected].4
405405
- uses: ./.github/actions/build-base-image
406406
with:
407407
BASE_BRANCH: ${{ env.BASE_BRANCH }}
@@ -423,7 +423,7 @@ jobs:
423423
rm -rf man
424424
tar czf ../otp_doc_html.tar.gz *
425425
- name: Upload html documentation archive
426-
uses: actions/[email protected].0
426+
uses: actions/[email protected].3
427427
with:
428428
name: otp_doc_html
429429
path: otp_doc_html.tar.gz
@@ -443,7 +443,7 @@ jobs:
443443
runs-on: ubuntu-latest
444444
needs: pack
445445
steps:
446-
- uses: actions/[email protected].1
446+
- uses: actions/[email protected].4
447447
- uses: ./.github/actions/build-base-image
448448
with:
449449
BASE_BRANCH: ${{ env.BASE_BRANCH }}
@@ -472,7 +472,7 @@ jobs:
472472
# type: ["os_mon","sasl"]
473473
fail-fast: false
474474
steps:
475-
- uses: actions/[email protected].1
475+
- uses: actions/[email protected].4
476476
- uses: ./.github/actions/build-base-image
477477
with:
478478
BASE_BRANCH: ${{ env.BASE_BRANCH }}
@@ -509,7 +509,7 @@ jobs:
509509
sudo bash -c "chown -R `whoami` make_test_dir && chmod -R +r make_test_dir"
510510
tar czf ${{ matrix.type }}_test_results.tar.gz make_test_dir
511511
- name: Upload test results
512-
uses: actions/[email protected].0
512+
uses: actions/[email protected].3
513513
if: ${{ !cancelled() }}
514514
with:
515515
name: ${{ matrix.type }}_test_results
@@ -521,12 +521,12 @@ jobs:
521521
if: ${{ !cancelled() }} # Run even if the need has failed
522522
needs: test
523523
steps:
524-
- uses: actions/[email protected].1
524+
- uses: actions/[email protected].4
525525
- uses: ./.github/actions/build-base-image
526526
with:
527527
BASE_BRANCH: ${{ env.BASE_BRANCH }}
528528
- name: Download test results
529-
uses: actions/[email protected].1
529+
uses: actions/[email protected].7
530530
- name: Merge test results
531531
run: |
532532
shopt -s nullglob
@@ -556,14 +556,14 @@ jobs:
556556
-e 's:\(file="erts/\)make_test_dir/[^/]*:\1test:g' \
557557
make_test_dir/*_junit.xml
558558
- name: Upload test results
559-
uses: actions/[email protected].0
559+
uses: actions/[email protected].3
560560
if: ${{ !cancelled() }}
561561
with:
562562
name: test_results
563563
path: test_results.tar.gz
564564
- name: Upload Test Results
565565
if: ${{ !cancelled() }}
566-
uses: actions/[email protected].0
566+
uses: actions/[email protected].3
567567
with:
568568
name: Unit Test Results
569569
path: |
@@ -590,15 +590,15 @@ jobs:
590590
echo "tag=${TAG}" >> $GITHUB_OUTPUT
591591
echo "vsn=${VSN}" >> $GITHUB_OUTPUT
592592
593-
- uses: actions/[email protected].1
593+
- uses: actions/[email protected].4
594594

595595
## Publish the pre-built archive and docs
596596
- name: Download source archive
597-
uses: actions/[email protected].1
597+
uses: actions/[email protected].7
598598
with:
599599
name: otp_prebuilt
600600
- name: Download html docs
601-
uses: actions/[email protected].1
601+
uses: actions/[email protected].7
602602
with:
603603
name: otp_doc_html
604604
- name: Download man docs
@@ -621,7 +621,7 @@ jobs:
621621
sha256sum $FILES > SHA256.txt
622622
623623
- name: Upload pre-built and doc tar archives
624-
uses: softprops/action-gh-release@v1
624+
uses: softprops/action-gh-release@v2.0.4
625625
with:
626626
name: OTP ${{ steps.tag.outputs.vsn }}
627627
files: |
@@ -640,7 +640,7 @@ jobs:
640640
runs-on: ubuntu-latest
641641
steps:
642642
- name: Upload
643-
uses: actions/[email protected].0
643+
uses: actions/[email protected].3
644644
with:
645645
name: Event File
646646
path: ${{ github.event_path }}

‎.github/workflows/pr-comment.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
outputs:
2222
result: ${{ steps.pr-number.outputs.result }}
2323
steps:
24-
- uses: actions/[email protected].1
24+
- uses: actions/[email protected].4
2525
- name: Fetch PR number
2626
id: pr-number
2727
env:
@@ -40,7 +40,7 @@ jobs:
4040
pull-requests: write
4141
if: github.event.action == 'requested' && needs.pr-number.outputs.result != ''
4242
steps:
43-
- uses: actions/[email protected].1
43+
- uses: actions/[email protected].4
4444
## We create an initial comment with some useful help to the user
4545
- uses: actions/[email protected]
4646
with:
@@ -63,7 +63,7 @@ jobs:
6363
needs.pr-number.outputs.result != '' &&
6464
github.event.workflow_run.conclusion != 'skipped'
6565
steps:
66-
- uses: actions/[email protected].1
66+
- uses: actions/[email protected].4
6767
- name: Download and Extract Artifacts
6868
id: extract
6969
env:
@@ -88,14 +88,14 @@ jobs:
8888
echo "HAS_TEST_ARTIFACTS=false" >> $GITHUB_OUTPUT
8989
fi
9090
91-
- uses: actions/[email protected].1
91+
- uses: actions/[email protected].4
9292
with:
9393
token: ${{ secrets.ERLANG_TOKEN }}
9494
repository: 'erlang/erlang.github.io'
9595
path: erlang.github.io
9696

9797
- name: Publish CT Test Results
98-
uses: EnricoMi/publish-unit-test-result-action@v2.12.0
98+
uses: EnricoMi/publish-unit-test-result-action@v2.16.1
9999
if: steps.extract.outputs.HAS_TEST_ARTIFACTS == 'true'
100100
with:
101101
commit: ${{ github.event.workflow_run.head_sha }}

0 commit comments

Comments
 (0)