Skip to content

Commit

Permalink
Merge branch 'lukas/gh/maint-26' into maint-26
Browse files Browse the repository at this point in the history
* lukas/gh/maint-26:
  Update github actions versions

# Conflicts:
#	.github/workflows/main.yaml
  • Loading branch information
Erlang/OTP committed May 2, 2024
2 parents 4806adf + a2371bf commit 6aef258
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 53 deletions.
8 changes: 4 additions & 4 deletions .github/actions/build-base-image/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ runs:
run: .github/scripts/cleanup_gh_runner.sh

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

- name: Docker login
uses: docker/login-action@v3.0.0
uses: docker/login-action@v3.1.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
Expand All @@ -39,13 +39,13 @@ runs:

- name: Cache pre-built src
if: inputs.BUILD_IMAGE == 'true'
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
path: otp_src.tar.gz
key: prebuilt-src-${{ github.ref_name }}-${{ github.sha }}
- name: Cache pre-built binaries
if: inputs.BUILD_IMAGE == 'true'
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
path: otp_cache.tar.gz
key: prebuilt-cache-${{ inputs.TYPE }}-${{ github.ref_name }}-${{ github.sha }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/actions-updater.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: actions/create-github-app-token@v1.7.0
uses: actions/create-github-app-token@v1.9.3
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PEM }}

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/add-to-project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
steps:
- name: Generate token
id: generate_token
uses: actions/create-github-app-token@v1.7.0
uses: actions/create-github-app-token@v1.9.3
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PEM }}

- uses: actions/add-to-project@v0.5.0
- uses: actions/add-to-project@v1.0.1
with:
project-url: https://github.com/orgs/erlang/projects/13
github-token: ${{ steps.generate_token.outputs.token }}
70 changes: 35 additions & 35 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
c-code-changes: ${{ steps.c-code-changes.outputs.changes }}
all: ${{ steps.apps.outputs.all }}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: ./.github/actions/build-base-image
with:
BASE_BRANCH: ${{ env.BASE_BRANCH }}
Expand All @@ -58,7 +58,7 @@ jobs:
ALL_APPS=$(jq -n --arg inarr "${ALL_APPS}" '$inarr | split("\n")' | tr '\n' ' ')
echo "all=${ALL_APPS}" >> $GITHUB_OUTPUT
- name: Check which applications have changed
uses: dorny/[email protected].0
uses: dorny/[email protected].2
id: app-changes
with:
filters: .github/scripts/path-filters.yaml
Expand All @@ -79,14 +79,14 @@ jobs:
with:
filters: .github/scripts/c-code-path-filters.yaml
- name: Cache pre-built src
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
path: otp_src.tar.gz
key: prebuilt-src-${{ github.ref_name }}-${{ github.sha }}
restore-keys: |
prebuilt-src-${{ github.base_ref }}-${{ github.event.pull_request.base.sha }}
- name: Cache pre-built binaries
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
path: otp_cache.tar.gz
key: prebuilt-cache-64-bit-${{ github.ref_name }}-${{ github.sha }}
Expand All @@ -95,12 +95,12 @@ jobs:
- name: Create initial pre-release tar
run: .github/scripts/init-pre-release.sh otp_archive.tar.gz otp_src.tar.gz
- name: Upload source tar archive
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: otp_git_archive
path: otp_archive.tar.gz
- name: Check how we can use the pre-built cache
uses: dorny/[email protected].0
uses: dorny/[email protected].2
id: cache
with:
filters: |
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
"`pwd`/.github/otp.tar.gz" \
"`pwd`/otp_archive.tar.gz"
- name: Upload restored cache
uses: actions/[email protected].0
uses: actions/[email protected].3
if: runner.debug == 1
with:
name: restored-cache
Expand All @@ -166,7 +166,7 @@ jobs:
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'
gzip otp_cache.tar
- name: Upload pre-built tar archives
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: otp_prebuilt
path: |
Expand All @@ -181,16 +181,16 @@ jobs:
env:
WXWIDGETS_VERSION: 3.1.5
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4

- name: Download source archive
uses: actions/[email protected].1
uses: actions/[email protected].7
with:
name: otp_prebuilt

- name: Cache wxWidgets
id: wxwidgets-cache
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
path: wxWidgets
key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}-12
Expand All @@ -216,7 +216,7 @@ jobs:
./bin/erl -noshell -eval '{wx_ref,_,_,_} = wx:new(), io:format("wx ok~n"), halt().'
- name: Upload tarball
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: otp_prebuilt_macos_x86-64
path: otp/otp_macos_*_x86-64.tar.gz
Expand All @@ -229,9 +229,9 @@ jobs:
runs-on: macos-12
needs: pack
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Download source archive
uses: actions/[email protected].1
uses: actions/[email protected].7
with:
name: otp_prebuilt

Expand All @@ -250,7 +250,7 @@ jobs:
xcodebuild -create-xcframework -output ./liberlang.xcframework -library liberlang.a
- name: Upload framework
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: ios_framework_${{ env.TARGET_ARCH }}
path: otp/liberlang.xcframework
Expand All @@ -266,7 +266,7 @@ jobs:
needs: pack
if: needs.pack.outputs.c-code-changes
steps:
- uses: Vampire/setup-wsl@v2.0.2
- uses: Vampire/setup-wsl@v3.0.0
with:
distribution: Ubuntu-18.04

Expand All @@ -280,7 +280,7 @@ jobs:
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")
- name: Cache wxWidgets
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
path: wxWidgets
key: wxWidgets-${{ env.WXWIDGETS_VERSION }}-${{ runner.os }}
Expand Down Expand Up @@ -322,7 +322,7 @@ jobs:
nmake TARGET_CPU=amd64 BUILD=release SHARED=0 DIR_SUFFIX_CPU= -f makefile.vc
- name: Download source archive
uses: actions/[email protected].1
uses: actions/[email protected].7
with:
name: otp_prebuilt

Expand Down Expand Up @@ -350,7 +350,7 @@ jobs:
./otp_build installer_win32
- name: Upload installer
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: otp_win32_installer
path: otp/release/win32/otp*.exe
Expand All @@ -362,7 +362,7 @@ jobs:
if: needs.pack.outputs.c-code-changes

steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: ./.github/actions/build-base-image
with:
BASE_BRANCH: ${{ env.BASE_BRANCH }}
Expand Down Expand Up @@ -390,7 +390,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: ./.github/actions/build-base-image
with:
BASE_BRANCH: ${{ env.BASE_BRANCH }}
Expand All @@ -401,7 +401,7 @@ jobs:
runs-on: ubuntu-latest
needs: pack
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: ./.github/actions/build-base-image
with:
BASE_BRANCH: ${{ env.BASE_BRANCH }}
Expand All @@ -423,7 +423,7 @@ jobs:
rm -rf man
tar czf ../otp_doc_html.tar.gz *
- name: Upload html documentation archive
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: otp_doc_html
path: otp_doc_html.tar.gz
Expand All @@ -443,7 +443,7 @@ jobs:
runs-on: ubuntu-latest
needs: pack
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: ./.github/actions/build-base-image
with:
BASE_BRANCH: ${{ env.BASE_BRANCH }}
Expand Down Expand Up @@ -472,7 +472,7 @@ jobs:
# type: ["os_mon","sasl"]
fail-fast: false
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: ./.github/actions/build-base-image
with:
BASE_BRANCH: ${{ env.BASE_BRANCH }}
Expand Down Expand Up @@ -509,7 +509,7 @@ jobs:
sudo bash -c "chown -R `whoami` make_test_dir && chmod -R +r make_test_dir"
tar czf ${{ matrix.type }}_test_results.tar.gz make_test_dir
- name: Upload test results
uses: actions/[email protected].0
uses: actions/[email protected].3
if: ${{ !cancelled() }}
with:
name: ${{ matrix.type }}_test_results
Expand All @@ -521,12 +521,12 @@ jobs:
if: ${{ !cancelled() }} # Run even if the need has failed
needs: test
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- uses: ./.github/actions/build-base-image
with:
BASE_BRANCH: ${{ env.BASE_BRANCH }}
- name: Download test results
uses: actions/[email protected].1
uses: actions/[email protected].7
- name: Merge test results
run: |
shopt -s nullglob
Expand Down Expand Up @@ -556,14 +556,14 @@ jobs:
-e 's:\(file="erts/\)make_test_dir/[^/]*:\1test:g' \
make_test_dir/*_junit.xml
- name: Upload test results
uses: actions/[email protected].0
uses: actions/[email protected].3
if: ${{ !cancelled() }}
with:
name: test_results
path: test_results.tar.gz
- name: Upload Test Results
if: ${{ !cancelled() }}
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: Unit Test Results
path: |
Expand All @@ -590,15 +590,15 @@ jobs:
echo "tag=${TAG}" >> $GITHUB_OUTPUT
echo "vsn=${VSN}" >> $GITHUB_OUTPUT
- uses: actions/[email protected].1
- uses: actions/[email protected].4

## Publish the pre-built archive and docs
- name: Download source archive
uses: actions/[email protected].1
uses: actions/[email protected].7
with:
name: otp_prebuilt
- name: Download html docs
uses: actions/[email protected].1
uses: actions/[email protected].7
with:
name: otp_doc_html
- name: Download man docs
Expand All @@ -621,7 +621,7 @@ jobs:
sha256sum $FILES > SHA256.txt
- name: Upload pre-built and doc tar archives
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2.0.4
with:
name: OTP ${{ steps.tag.outputs.vsn }}
files: |
Expand All @@ -640,7 +640,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Upload
uses: actions/[email protected].0
uses: actions/[email protected].3
with:
name: Event File
path: ${{ github.event_path }}
10 changes: 5 additions & 5 deletions .github/workflows/pr-comment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
outputs:
result: ${{ steps.pr-number.outputs.result }}
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Fetch PR number
id: pr-number
env:
Expand All @@ -40,7 +40,7 @@ jobs:
pull-requests: write
if: github.event.action == 'requested' && needs.pr-number.outputs.result != ''
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
## We create an initial comment with some useful help to the user
- uses: actions/[email protected]
with:
Expand All @@ -63,7 +63,7 @@ jobs:
needs.pr-number.outputs.result != '' &&
github.event.workflow_run.conclusion != 'skipped'
steps:
- uses: actions/[email protected].1
- uses: actions/[email protected].4
- name: Download and Extract Artifacts
id: extract
env:
Expand All @@ -88,14 +88,14 @@ jobs:
echo "HAS_TEST_ARTIFACTS=false" >> $GITHUB_OUTPUT
fi
- uses: actions/[email protected].1
- uses: actions/[email protected].4
with:
token: ${{ secrets.ERLANG_TOKEN }}
repository: 'erlang/erlang.github.io'
path: erlang.github.io

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

0 comments on commit 6aef258

Please sign in to comment.