From 203c3677b6ec757253d368d0acdc1b6454fc5bfa Mon Sep 17 00:00:00 2001 From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:10:00 +0530 Subject: [PATCH 1/6] updated workflows with ubuntu 24.04 runner --- .../workflows/e2e-cache-dependency-path.yml | 6 +-- .github/workflows/e2e-cache.yml | 12 ++--- .github/workflows/e2e-local-file.yml | 6 +-- .github/workflows/e2e-publishing.yml | 8 +-- .github/workflows/e2e-versions.yml | 50 +++++++++---------- .../workflows/publish-immutable-actions.yml | 2 +- .../workflows/release-new-action-version.yml | 2 +- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/e2e-cache-dependency-path.yml b/.github/workflows/e2e-cache-dependency-path.yml index f276ef312..b6961062f 100644 --- a/.github/workflows/e2e-cache-dependency-path.yml +++ b/.github/workflows/e2e-cache-dependency-path.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] needs: gradle1-save steps: - name: Checkout @@ -72,7 +72,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] needs: gradle1-save steps: - name: Checkout diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 95031dbb1..978ff9de8 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-24.04] needs: gradle-save steps: - name: Checkout @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -93,7 +93,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-24.04] needs: maven-save steps: - name: Checkout @@ -121,7 +121,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-22.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -170,7 +170,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-22.04] needs: sbt-save steps: - name: Checkout diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index 9757621ed..1dded20e5 100644 --- a/.github/workflows/e2e-local-file.yml +++ b/.github/workflows/e2e-local-file.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -92,7 +92,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/e2e-publishing.yml b/.github/workflows/e2e-publishing.yml index dd7bd4351..b17d4ec02 100644 --- a/.github/workflows/e2e-publishing.yml +++ b/.github/workflows/e2e-publishing.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -57,7 +57,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -93,7 +93,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -130,7 +130,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 045dee15d..c2f5f02ab 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-24.04] distribution: [ 'temurin', 'adopt', @@ -47,7 +47,7 @@ jobs: os: windows-latest version: 21 - distribution: oracle - os: ubuntu-latest + os: ubuntu-24.04 version: 21 - distribution: graalvm os: macos-latest @@ -56,10 +56,10 @@ jobs: os: windows-latest version: 21 - distribution: graalvm - os: ubuntu-latest + os: ubuntu-24.04 version: 21 - distribution: graalvm - os: ubuntu-latest + os: ubuntu-24.04 version: '24-ea' steps: - name: Checkout @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] distribution: ['temurin', 'zulu', 'liberica'] version: - '11.0' @@ -89,19 +89,19 @@ jobs: - '17.0.7+7' include: - distribution: oracle - os: ubuntu-latest + os: ubuntu-24.04 version: '21.0.4' - distribution: graalvm - os: ubuntu-latest + os: ubuntu-24.04 version: '21.0.4' - distribution: dragonwell - os: ubuntu-latest + os: ubuntu-24.04 version: '11.0' - distribution: dragonwell - os: ubuntu-latest + os: ubuntu-24.04 version: '11.0.13+9' - distribution: sapmachine - os: ubuntu-latest + os: ubuntu-24.04 version: '17.0.7' steps: - name: Checkout @@ -123,7 +123,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] distribution: ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine'] exclude: @@ -150,7 +150,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] distribution: ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine'] exclude: @@ -191,7 +191,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-24.04] version: ['17-ea', '15.0.0-ea.14'] steps: - name: Checkout @@ -213,7 +213,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] version: ['17-ea'] steps: - name: Checkout @@ -235,7 +235,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] version: ['17-ea', '21-ea'] steps: - name: Checkout @@ -257,7 +257,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-24.04] distribution: ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine'] java-package: ['jre'] version: ['17.0'] @@ -265,19 +265,19 @@ jobs: - distribution: 'zulu' java-package: jre+fx version: '21' - os: ubuntu-latest + os: ubuntu-24.04 - distribution: 'zulu' java-package: jdk+fx version: '21.0' - os: ubuntu-latest + os: ubuntu-24.04 - distribution: 'liberica' java-package: jdk+fx version: '21' - os: ubuntu-latest + os: ubuntu-24.04 - distribution: 'liberica' java-package: jre+fx version: '11' - os: ubuntu-latest + os: ubuntu-24.04 - distribution: 'corretto' java-package: jre version: '8' @@ -305,7 +305,7 @@ jobs: fail-fast: false matrix: # x86 is not supported on macOS - os: [windows-latest, ubuntu-latest] + os: [windows-latest, ubuntu-24.04] distribution: ['liberica', 'zulu', 'corretto'] version: ['11'] steps: @@ -328,7 +328,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] distribution: ['temurin', 'microsoft', 'corretto'] java-version-file: ['.java-version', '.tool-versions'] steps: @@ -357,7 +357,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] distribution: ['temurin', 'zulu', 'liberica', 'microsoft', 'corretto'] java-version-file: ['.java-version', '.tool-versions'] steps: @@ -385,7 +385,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] distribution: ['adopt', 'adopt-openj9', 'zulu'] java-version-file: ['.java-version', '.tool-versions'] steps: @@ -413,7 +413,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-latest] + os: [macos-latest, windows-latest, ubuntu-24.04] distribution: ['adopt', 'zulu', 'liberica'] java-version-file: ['.java-version', '.tool-versions'] steps: diff --git a/.github/workflows/publish-immutable-actions.yml b/.github/workflows/publish-immutable-actions.yml index 87c020728..84539ee1a 100644 --- a/.github/workflows/publish-immutable-actions.yml +++ b/.github/workflows/publish-immutable-actions.yml @@ -6,7 +6,7 @@ on: jobs: publish: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 permissions: contents: read id-token: write diff --git a/.github/workflows/release-new-action-version.yml b/.github/workflows/release-new-action-version.yml index e584e46f6..7f865b071 100644 --- a/.github/workflows/release-new-action-version.yml +++ b/.github/workflows/release-new-action-version.yml @@ -19,7 +19,7 @@ jobs: name: Update the major tag to include the ${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }} changes environment: name: releaseNewActionVersion - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Update the ${{ env.TAG_NAME }} tag id: update-major-tag From c978d23ccd16af31627a9b6c8012ad7260fe0943 Mon Sep 17 00:00:00 2001 From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com> Date: Fri, 11 Oct 2024 17:21:53 +0530 Subject: [PATCH 2/6] added workflow_dispatch to test workflows --- .github/workflows/e2e-cache-dependency-path.yml | 1 + .github/workflows/e2e-cache.yml | 1 + .github/workflows/e2e-local-file.yml | 1 + .github/workflows/e2e-publishing.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/e2e-cache-dependency-path.yml b/.github/workflows/e2e-cache-dependency-path.yml index b6961062f..549a4963e 100644 --- a/.github/workflows/e2e-cache-dependency-path.yml +++ b/.github/workflows/e2e-cache-dependency-path.yml @@ -10,6 +10,7 @@ on: pull_request: paths-ignore: - '**.md' + workflow_dispatch: defaults: run: diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 978ff9de8..f90ab6343 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -10,6 +10,7 @@ on: pull_request: paths-ignore: - '**.md' + workflow_dispatch: defaults: run: diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index 1dded20e5..94d161849 100644 --- a/.github/workflows/e2e-local-file.yml +++ b/.github/workflows/e2e-local-file.yml @@ -10,6 +10,7 @@ on: pull_request: paths-ignore: - '**.md' + workflow_dispatch: jobs: setup-java-local-file-adopt: diff --git a/.github/workflows/e2e-publishing.yml b/.github/workflows/e2e-publishing.yml index b17d4ec02..5354ca323 100644 --- a/.github/workflows/e2e-publishing.yml +++ b/.github/workflows/e2e-publishing.yml @@ -10,6 +10,7 @@ on: pull_request: paths-ignore: - '**.md' + workflow_dispatch: defaults: run: From 40d396dd540f00597594d6e9b4c46c6062f44e36 Mon Sep 17 00:00:00 2001 From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com> Date: Fri, 11 Oct 2024 19:12:41 +0530 Subject: [PATCH 3/6] updated workflow to ubnutu 22.04 --- .github/workflows/e2e-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index c2f5f02ab..00641ccdc 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -305,7 +305,7 @@ jobs: fail-fast: false matrix: # x86 is not supported on macOS - os: [windows-latest, ubuntu-24.04] + os: [windows-latest, ubuntu-22.04] distribution: ['liberica', 'zulu', 'corretto'] version: ['11'] steps: From 9f92a6172f5d638f26b804d36bfa3870e14329dc Mon Sep 17 00:00:00 2001 From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com> Date: Mon, 14 Oct 2024 11:47:56 +0530 Subject: [PATCH 4/6] Updated workflows for PR --- .github/workflows/e2e-cache-dependency-path.yml | 1 - .github/workflows/e2e-cache.yml | 1 - .github/workflows/e2e-local-file.yml | 1 - .github/workflows/e2e-publishing.yml | 1 - 4 files changed, 4 deletions(-) diff --git a/.github/workflows/e2e-cache-dependency-path.yml b/.github/workflows/e2e-cache-dependency-path.yml index 549a4963e..b6961062f 100644 --- a/.github/workflows/e2e-cache-dependency-path.yml +++ b/.github/workflows/e2e-cache-dependency-path.yml @@ -10,7 +10,6 @@ on: pull_request: paths-ignore: - '**.md' - workflow_dispatch: defaults: run: diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index f90ab6343..978ff9de8 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -10,7 +10,6 @@ on: pull_request: paths-ignore: - '**.md' - workflow_dispatch: defaults: run: diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index 94d161849..1dded20e5 100644 --- a/.github/workflows/e2e-local-file.yml +++ b/.github/workflows/e2e-local-file.yml @@ -10,7 +10,6 @@ on: pull_request: paths-ignore: - '**.md' - workflow_dispatch: jobs: setup-java-local-file-adopt: diff --git a/.github/workflows/e2e-publishing.yml b/.github/workflows/e2e-publishing.yml index 5354ca323..b17d4ec02 100644 --- a/.github/workflows/e2e-publishing.yml +++ b/.github/workflows/e2e-publishing.yml @@ -10,7 +10,6 @@ on: pull_request: paths-ignore: - '**.md' - workflow_dispatch: defaults: run: From 0f4f34966324c53188eb34eea8fb120cfdbd73bc Mon Sep 17 00:00:00 2001 From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com> Date: Mon, 14 Oct 2024 18:09:37 +0530 Subject: [PATCH 5/6] workflows updated to ubuntu-latest --- .../workflows/e2e-cache-dependency-path.yml | 6 +-- .github/workflows/e2e-cache.yml | 8 ++-- .github/workflows/e2e-local-file.yml | 6 +-- .github/workflows/e2e-publishing.yml | 8 ++-- .github/workflows/e2e-versions.yml | 48 +++++++++---------- .../workflows/publish-immutable-actions.yml | 2 +- .../workflows/release-new-action-version.yml | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/e2e-cache-dependency-path.yml b/.github/workflows/e2e-cache-dependency-path.yml index b6961062f..f276ef312 100644 --- a/.github/workflows/e2e-cache-dependency-path.yml +++ b/.github/workflows/e2e-cache-dependency-path.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -47,7 +47,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] needs: gradle1-save steps: - name: Checkout @@ -72,7 +72,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] needs: gradle1-save steps: - name: Checkout diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index 978ff9de8..bc685ec01 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-24.04] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -46,7 +46,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-24.04] + os: [macos-13, windows-latest, ubuntu-latest] needs: gradle-save steps: - name: Checkout @@ -70,7 +70,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-24.04] + os: [macos-13, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -93,7 +93,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-24.04] + os: [macos-13, windows-latest, ubuntu-latest] needs: maven-save steps: - name: Checkout diff --git a/.github/workflows/e2e-local-file.yml b/.github/workflows/e2e-local-file.yml index 1dded20e5..9757621ed 100644 --- a/.github/workflows/e2e-local-file.yml +++ b/.github/workflows/e2e-local-file.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -55,7 +55,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -92,7 +92,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/e2e-publishing.yml b/.github/workflows/e2e-publishing.yml index b17d4ec02..dd7bd4351 100644 --- a/.github/workflows/e2e-publishing.yml +++ b/.github/workflows/e2e-publishing.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -57,7 +57,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -93,7 +93,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 @@ -130,7 +130,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/e2e-versions.yml b/.github/workflows/e2e-versions.yml index 00641ccdc..357a45ad9 100644 --- a/.github/workflows/e2e-versions.yml +++ b/.github/workflows/e2e-versions.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-24.04] + os: [macos-13, windows-latest, ubuntu-latest] distribution: [ 'temurin', 'adopt', @@ -47,7 +47,7 @@ jobs: os: windows-latest version: 21 - distribution: oracle - os: ubuntu-24.04 + os: ubuntu-latest version: 21 - distribution: graalvm os: macos-latest @@ -56,10 +56,10 @@ jobs: os: windows-latest version: 21 - distribution: graalvm - os: ubuntu-24.04 + os: ubuntu-latest version: 21 - distribution: graalvm - os: ubuntu-24.04 + os: ubuntu-latest version: '24-ea' steps: - name: Checkout @@ -81,7 +81,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica'] version: - '11.0' @@ -89,19 +89,19 @@ jobs: - '17.0.7+7' include: - distribution: oracle - os: ubuntu-24.04 + os: ubuntu-latest version: '21.0.4' - distribution: graalvm - os: ubuntu-24.04 + os: ubuntu-latest version: '21.0.4' - distribution: dragonwell - os: ubuntu-24.04 + os: ubuntu-latest version: '11.0' - distribution: dragonwell - os: ubuntu-24.04 + os: ubuntu-latest version: '11.0.13+9' - distribution: sapmachine - os: ubuntu-24.04 + os: ubuntu-latest version: '17.0.7' steps: - name: Checkout @@ -123,7 +123,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine'] exclude: @@ -150,7 +150,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine'] exclude: @@ -191,7 +191,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-24.04] + os: [macos-13, windows-latest, ubuntu-latest] version: ['17-ea', '15.0.0-ea.14'] steps: - name: Checkout @@ -213,7 +213,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] version: ['17-ea'] steps: - name: Checkout @@ -235,7 +235,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] version: ['17-ea', '21-ea'] steps: - name: Checkout @@ -257,7 +257,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-13, windows-latest, ubuntu-24.04] + os: [macos-13, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine'] java-package: ['jre'] version: ['17.0'] @@ -265,19 +265,19 @@ jobs: - distribution: 'zulu' java-package: jre+fx version: '21' - os: ubuntu-24.04 + os: ubuntu-latest - distribution: 'zulu' java-package: jdk+fx version: '21.0' - os: ubuntu-24.04 + os: ubuntu-latest - distribution: 'liberica' java-package: jdk+fx version: '21' - os: ubuntu-24.04 + os: ubuntu-latest - distribution: 'liberica' java-package: jre+fx version: '11' - os: ubuntu-24.04 + os: ubuntu-latest - distribution: 'corretto' java-package: jre version: '8' @@ -328,7 +328,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['temurin', 'microsoft', 'corretto'] java-version-file: ['.java-version', '.tool-versions'] steps: @@ -357,7 +357,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['temurin', 'zulu', 'liberica', 'microsoft', 'corretto'] java-version-file: ['.java-version', '.tool-versions'] steps: @@ -385,7 +385,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['adopt', 'adopt-openj9', 'zulu'] java-version-file: ['.java-version', '.tool-versions'] steps: @@ -413,7 +413,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-24.04] + os: [macos-latest, windows-latest, ubuntu-latest] distribution: ['adopt', 'zulu', 'liberica'] java-version-file: ['.java-version', '.tool-versions'] steps: diff --git a/.github/workflows/publish-immutable-actions.yml b/.github/workflows/publish-immutable-actions.yml index 84539ee1a..87c020728 100644 --- a/.github/workflows/publish-immutable-actions.yml +++ b/.github/workflows/publish-immutable-actions.yml @@ -6,7 +6,7 @@ on: jobs: publish: - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest permissions: contents: read id-token: write diff --git a/.github/workflows/release-new-action-version.yml b/.github/workflows/release-new-action-version.yml index 7f865b071..e584e46f6 100644 --- a/.github/workflows/release-new-action-version.yml +++ b/.github/workflows/release-new-action-version.yml @@ -19,7 +19,7 @@ jobs: name: Update the major tag to include the ${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }} changes environment: name: releaseNewActionVersion - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Update the ${{ env.TAG_NAME }} tag id: update-major-tag From 221c13b992612d95ab5ae390b53b5da0a02f4067 Mon Sep 17 00:00:00 2001 From: mahabaleshwars <147705296+mahabaleshwars@users.noreply.github.com> Date: Wed, 11 Dec 2024 09:25:54 +0530 Subject: [PATCH 6/6] Audit fixes --- package-lock.json | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0f806bc3e..fd4dfc6cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2495,10 +2495,11 @@ } }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0",