From ba96a1feca0b4759c91b60f01ec663a5df80c62d Mon Sep 17 00:00:00 2001 From: Daniel Kelemen Date: Mon, 1 Jul 2024 12:51:03 +0200 Subject: [PATCH] core4 runner, ee login, all distros --- .github/workflows/build-and-test-ee.yml | 8 +++++++- .github/workflows/build-test-and-publish-ce.yml | 10 +++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test-ee.yml b/.github/workflows/build-and-test-ee.yml index 0a336dd6..bd8d3596 100644 --- a/.github/workflows/build-and-test-ee.yml +++ b/.github/workflows/build-and-test-ee.yml @@ -16,10 +16,16 @@ jobs: strategy: matrix: DISTRO: [tomcat, wildfly, run] - PLATFORM: [ubuntu-22.04, aws-arm-core-2-default] + PLATFORM: [ubuntu-22.04, aws-arm-core-4-default] steps: - name: Checkout uses: actions/checkout@v4 + - name: Login to Docker Hub + uses: docker/login-action@v3 + if: ${{ matrix.PLATFORM == 'aws-arm-core-4-default' }} + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_PASSWORD }} - name: Build run: ./pipeline.sh env: diff --git a/.github/workflows/build-test-and-publish-ce.yml b/.github/workflows/build-test-and-publish-ce.yml index 1098e6f9..9a01948d 100644 --- a/.github/workflows/build-test-and-publish-ce.yml +++ b/.github/workflows/build-test-and-publish-ce.yml @@ -6,14 +6,14 @@ jobs: strategy: fail-fast: false matrix: - DISTRO: [tomcat] - PLATFORM: [ubuntu-22.04, aws-arm-core-2-default] + DISTRO: [tomcat, wildfly, run] + PLATFORM: [ubuntu-22.04, aws-arm-core-4-default] steps: - name: Checkout uses: actions/checkout@v4 - name: Login to Docker Hub uses: docker/login-action@v3 - if: ${{ matrix.PLATFORM == 'aws-arm-core-2-default' }} + if: ${{ matrix.PLATFORM == 'aws-arm-core-4-default' }} with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_PASSWORD }} @@ -31,12 +31,12 @@ jobs: DISTRO: ${{ matrix.DISTRO }} EE: false publish: - runs-on: aws-arm-core-2-default + runs-on: aws-arm-core-4-default needs: build-and-test #if: ${{ github.ref == 'refs/heads/next' || startsWith(github.ref, 'refs/heads/7.') }} strategy: matrix: - DISTRO: [tomcat] + DISTRO: [tomcat, wildfly, run] steps: - name: Checkout uses: actions/checkout@v4