From 6e5629b9e267f259a80b37b219573e031a1c452a Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 6 Dec 2022 13:35:22 -0500 Subject: [PATCH 1/2] ci: update `actions/setup-java` from v1 to v3.8 https://github.com/actions/setup-java/releases/tag/v3.8.0 This should fix a number of GitHub Actions deprecations: ``` Node.js 12 actions are deprecated. For more information see: https://github.blog/changelog/2022-09-22-github-actions-all-actions-will-begin-running-on-node16-instead-of-node12/. Please update the following actions to use Node.js 16: actions/setup-java@v1 The `set-output` command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ ``` Signed-off-by: JP Simard --- .github/workflows/android_build.yml | 10 +++++----- .github/workflows/android_tests.yml | 6 +++--- .github/workflows/asan.yml | 2 +- .github/workflows/format.yml | 2 +- .github/workflows/tsan.yml | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml index a0efe9cdf0fdd..a824c5d2f656e 100644 --- a/.github/workflows/android_build.yml +++ b/.github/workflows/android_build.yml @@ -19,7 +19,7 @@ jobs: timeout-minutes: 90 steps: - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk @@ -42,7 +42,7 @@ jobs: timeout-minutes: 50 steps: - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk @@ -74,7 +74,7 @@ jobs: timeout-minutes: 50 steps: - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk @@ -106,7 +106,7 @@ jobs: timeout-minutes: 50 steps: - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk @@ -138,7 +138,7 @@ jobs: timeout-minutes: 50 steps: - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml index 1ecd972125e98..fe79e7db0b7dd 100644 --- a/.github/workflows/android_tests.yml +++ b/.github/workflows/android_tests.yml @@ -33,7 +33,7 @@ jobs: fi - name: 'Java setup' if: steps.check_context.outputs.run_tests == 'true' - uses: actions/setup-java@v1 + uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk @@ -70,7 +70,7 @@ jobs: fi - name: 'Java setup' if: steps.check_context.outputs.run_tests == 'true' - uses: actions/setup-java@v1 + uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk @@ -117,7 +117,7 @@ jobs: fi - name: 'Java setup' if: steps.check_context.outputs.run_tests == 'true' - uses: actions/setup-java@v1 + uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index e2d08b359dedb..edb51339478b8 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -36,7 +36,7 @@ jobs: echo "Skipping tests." echo "run_tests=false" >> $GITHUB_OUTPUT fi - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c if: steps.check-cache.outputs.cache-hit != 'true' with: java-version: '8' diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 281ca91296087..30983161b02cd 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -65,7 +65,7 @@ jobs: timeout-minutes: 45 steps: - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c with: java-version: '8' java-package: jdk diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 8431e4606ca96..b4da26d527ee0 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -36,7 +36,7 @@ jobs: echo "Skipping tests." echo "run_tests=false" >> $GITHUB_OUTPUT fi - - uses: actions/setup-java@v1 + - uses: actions/setup-java@c3ac5dd0ed8db40fedb61c32fbe677e6b355e94c if: steps.check-cache.outputs.cache-hit != 'true' with: java-version: '8' From 48a68edd20df0b26e4a73647748c9315e9f3e3c4 Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 6 Dec 2022 13:38:09 -0500 Subject: [PATCH 2/2] distribution: zulu Signed-off-by: JP Simard --- .github/workflows/android_build.yml | 5 +++++ .github/workflows/android_tests.yml | 3 +++ .github/workflows/asan.yml | 1 + .github/workflows/format.yml | 1 + .github/workflows/tsan.yml | 1 + 5 files changed, 11 insertions(+) diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml index a824c5d2f656e..ace3e9860e3ca 100644 --- a/.github/workflows/android_build.yml +++ b/.github/workflows/android_build.yml @@ -24,6 +24,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Install dependencies' run: cd mobile && ./ci/mac_ci_setup.sh --android - name: 'Build envoy.aar distributable' @@ -47,6 +48,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - run: cd mobile && ./ci/mac_ci_setup.sh --android name: 'Install dependencies' - name: 'Start simulator' @@ -79,6 +81,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Install dependencies' run: cd mobile && ./ci/mac_ci_setup.sh --android - name: 'Start simulator' @@ -111,6 +114,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Install dependencies' run: cd mobile && ./ci/mac_ci_setup.sh --android - name: 'Start simulator' @@ -143,6 +147,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Install dependencies' run: cd mobile && ./ci/mac_ci_setup.sh --android - name: 'Start simulator' diff --git a/.github/workflows/android_tests.yml b/.github/workflows/android_tests.yml index fe79e7db0b7dd..db85cbf3dc2ef 100644 --- a/.github/workflows/android_tests.yml +++ b/.github/workflows/android_tests.yml @@ -38,6 +38,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Install dependencies' if: steps.check_context.outputs.run_tests == 'true' run: cd mobile && ./ci/mac_ci_setup.sh @@ -75,6 +76,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Install dependencies' if: steps.check_context.outputs.run_tests == 'true' run: cd mobile && ./ci/mac_ci_setup.sh @@ -122,6 +124,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Install dependencies' if: steps.check_context.outputs.run_tests == 'true' run: cd mobile && ./ci/linux_ci_setup.sh diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index edb51339478b8..d708dde3dc537 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -42,6 +42,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Run tests' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 30983161b02cd..f07ddd0f6c31a 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -70,6 +70,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - run: cd mobile && ./ci/mac_ci_setup.sh name: 'Install dependencies' - name: 'Run Kotlin Lint (Detekt)' diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index b4da26d527ee0..e2f6b8e0691fb 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -42,6 +42,7 @@ jobs: java-version: '8' java-package: jdk architecture: x64 + distribution: zulu - name: 'Run tests' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}