From 9622d2a75ae941296866ec3466b0d3b52b045b62 Mon Sep 17 00:00:00 2001 From: Davy MELINA Date: Mon, 11 Dec 2023 11:24:28 +0100 Subject: [PATCH] Fix python version --- .github/workflows/azure-x86-java11.yml | 2 +- .github/workflows/azure-x86-java17.yml | 2 +- .github/workflows/azure-x86-java19.yml | 35 ------------------ .github/workflows/azure-x86-java20.yml | 35 ------------------ .github/workflows/azure-x86-java21.yml | 2 +- .github/workflows/azure-x86-java8.yml | 2 +- .github/workflows/gcp-x86-java-latest.yml | 2 +- .github/workflows/gcp-x86-java11.yml | 2 +- .github/workflows/gcp-x86-java17.yml | 2 +- .github/workflows/gcp-x86-java19.yml | 43 ----------------------- .github/workflows/gcp-x86-java21.yml | 2 +- .github/workflows/gcp-x86-java8.yml | 2 +- 12 files changed, 9 insertions(+), 122 deletions(-) delete mode 100644 .github/workflows/azure-x86-java19.yml delete mode 100644 .github/workflows/azure-x86-java20.yml delete mode 100644 .github/workflows/gcp-x86-java19.yml diff --git a/.github/workflows/azure-x86-java11.yml b/.github/workflows/azure-x86-java11.yml index 8f2af43..acddb82 100644 --- a/.github/workflows/azure-x86-java11.yml +++ b/.github/workflows/azure-x86-java11.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/azure-x86-java17.yml b/.github/workflows/azure-x86-java17.yml index 639694c..0072092 100644 --- a/.github/workflows/azure-x86-java17.yml +++ b/.github/workflows/azure-x86-java17.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/azure-x86-java19.yml b/.github/workflows/azure-x86-java19.yml deleted file mode 100644 index 04227cc..0000000 --- a/.github/workflows/azure-x86-java19.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Azure x86 java 19 -on: - workflow_dispatch: - inputs: - image_version: - description: 'Image version (x.x.x)' - required: true - -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - - name: Setup Ansible and JMESPath - uses: BSFishy/pip-action@v1 - with: - packages: | - ansible==4.8.0 - jmespath - - - name: Setup Packer - uses: hashicorp-contrib/setup-packer@v1 - with: - packer-version: '1.7.8' - - - name: Build image from template - run: ./build-azure-x86-zulu.sh --java-major 19 --client-id "${{ secrets.AZURE_CLIENT_ID }}" --client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" --subscription-id "${{ secrets.AZURE_SUBSCRIPTION_ID }}" --tenant-id "${{ secrets.AZURE_TENANT_ID }}" --image-version "${{ github.event.inputs.image_version }}" diff --git a/.github/workflows/azure-x86-java20.yml b/.github/workflows/azure-x86-java20.yml deleted file mode 100644 index 5312895..0000000 --- a/.github/workflows/azure-x86-java20.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Azure x86 java 20 -on: - workflow_dispatch: - inputs: - image_version: - description: 'Image version (x.x.x)' - required: true - -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - - name: Setup Ansible and JMESPath - uses: BSFishy/pip-action@v1 - with: - packages: | - ansible==4.8.0 - jmespath - - - name: Setup Packer - uses: hashicorp-contrib/setup-packer@v1 - with: - packer-version: '1.7.8' - - - name: Build image from template - run: ./build-azure-x86-zulu.sh --java-major 20 --client-id "${{ secrets.AZURE_CLIENT_ID }}" --client-secret "${{ secrets.AZURE_CLIENT_SECRET }}" --subscription-id "${{ secrets.AZURE_SUBSCRIPTION_ID }}" --tenant-id "${{ secrets.AZURE_TENANT_ID }}" --image-version "${{ github.event.inputs.image_version }}" diff --git a/.github/workflows/azure-x86-java21.yml b/.github/workflows/azure-x86-java21.yml index 2d03bca..fed982d 100644 --- a/.github/workflows/azure-x86-java21.yml +++ b/.github/workflows/azure-x86-java21.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/azure-x86-java8.yml b/.github/workflows/azure-x86-java8.yml index 7ddc483..05fd2f4 100644 --- a/.github/workflows/azure-x86-java8.yml +++ b/.github/workflows/azure-x86-java8.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/gcp-x86-java-latest.yml b/.github/workflows/gcp-x86-java-latest.yml index 33f828f..1f5f0b7 100644 --- a/.github/workflows/gcp-x86-java-latest.yml +++ b/.github/workflows/gcp-x86-java-latest.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/gcp-x86-java11.yml b/.github/workflows/gcp-x86-java11.yml index 1bd9d04..031128e 100644 --- a/.github/workflows/gcp-x86-java11.yml +++ b/.github/workflows/gcp-x86-java11.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/gcp-x86-java17.yml b/.github/workflows/gcp-x86-java17.yml index 3b1a235..41abc5b 100644 --- a/.github/workflows/gcp-x86-java17.yml +++ b/.github/workflows/gcp-x86-java17.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/gcp-x86-java19.yml b/.github/workflows/gcp-x86-java19.yml deleted file mode 100644 index c548e5f..0000000 --- a/.github/workflows/gcp-x86-java19.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: GCP x86 java 19 -on: - workflow_dispatch: - -defaults: - run: - shell: bash - -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 60 - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Setup Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - - name: Setup Ansible and JMESPath - uses: BSFishy/pip-action@v1 - with: - packages: | - ansible==4.8.0 - jmespath - - - name: Setup Packer - uses: hashicorp-contrib/setup-packer@v1 - with: - packer-version: '1.7.8' - - - name: Configure GCP Credentials - run: | - echo $ENV_FILE > creds.json; - shell: bash - env: - ENV_FILE: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} - - - name: Build image from template - run: export GOOGLE_APPLICATION_CREDENTIALS="./creds.json"; ./build-gcp-x86-zulu.sh --java-major 19 --project-id "${{ secrets.GOOGLE_PROJECT_ID }}" --latest false - diff --git a/.github/workflows/gcp-x86-java21.yml b/.github/workflows/gcp-x86-java21.yml index c768f36..404e8cb 100644 --- a/.github/workflows/gcp-x86-java21.yml +++ b/.github/workflows/gcp-x86-java21.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1 diff --git a/.github/workflows/gcp-x86-java8.yml b/.github/workflows/gcp-x86-java8.yml index d3dd11e..99a7686 100644 --- a/.github/workflows/gcp-x86-java8.yml +++ b/.github/workflows/gcp-x86-java8.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2 with: - python-version: '3.x' + python-version: '3.11.5' - name: Setup Ansible and JMESPath uses: BSFishy/pip-action@v1