Skip to content

Commit 79f5a91

Browse files
committed
update pipeline
1 parent b723407 commit 79f5a91

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/authorization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
pom_dir: authorization
2727
image_name: authorization_jvm_amd64
2828
image_file: authorization_jvm_amd64.yaml
29-
runs_on: ubuntu-latest
29+
image_platform: linux/amd64
3030
build-oci-image-jvm-aarch64:
3131
needs: unit-test
3232
uses: making/oauth2-sso-demo/.github/workflows/build-oci-image-jvm.yaml@main
3333
with:
3434
pom_dir: authorization
3535
image_name: authorization_jvm_aarch64
3636
image_file: authorization_jvm_aarch64.yaml
37-
runs_on: raspberrypi
37+
image_platform: linux/arm64
3838
push-multi-arch-image-jvm:
3939
needs:
4040
- build-oci-image-jvm-amd64

.github/workflows/build-oci-image-jvm.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ on:
1818
required: false
1919
type: string
2020
default: 'refs/heads/main'
21-
runs_on:
21+
image_platform:
2222
required: false
2323
type: string
24-
default: ubuntu-latest
24+
default: linux/amd64
2525
jobs:
2626
build:
27-
runs-on: ${{ inputs.runs_on }}
27+
runs-on: ubuntu-latest
2828
permissions:
2929
contents: read
3030
packages: write
@@ -43,7 +43,7 @@ jobs:
4343
- name: build image (Paketo Buildpack)
4444
run: |
4545
OS_ARCH=$(./mvnw -f ${{ inputs.pom_dir }} help:evaluate -Dexpression=os.arch -q -DforceStdout)
46-
./mvnw -V -f ${{ inputs.pom_dir }} --no-transfer-progress spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=ghcr.io/${{ github.repository }}/${{ inputs.pom_dir }}:jvm_${OS_ARCH}_${GITHUB_SHA}
46+
./mvnw -V -f ${{ inputs.pom_dir }} --no-transfer-progress spring-boot:build-image -DskipTests -Dspring-boot.build-image.imageName=ghcr.io/${{ github.repository }}/${{ inputs.pom_dir }}:jvm_${OS_ARCH}_${GITHUB_SHA} -Dspring-boot.build-image.imagePlatform=${{ inputs.image_platform }}
4747
- name: Login to GitHub Container Registry
4848
if: github.ref == inputs.target_ref
4949
uses: docker/login-action@v3

.github/workflows/todo-api.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626
pom_dir: todo-api
2727
image_name: todo-api_jvm_amd64
2828
image_file: todo-api_jvm_amd64.yaml
29-
runs_on: ubuntu-latest
29+
image_platform: linux/amd64
3030
build-oci-image-jvm-aarch64:
3131
needs: unit-test
3232
uses: making/oauth2-sso-demo/.github/workflows/build-oci-image-jvm.yaml@main
3333
with:
3434
pom_dir: todo-api
3535
image_name: todo-api_jvm_aarch64
3636
image_file: todo-api_jvm_aarch64.yaml
37-
runs_on: raspberrypi
37+
image_platform: linux/arm64
3838
push-multi-arch-image-jvm:
3939
needs:
4040
- build-oci-image-jvm-amd64

.github/workflows/todo-frontend.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
pom_dir: todo-frontend
2929
image_name: todo-frontend_jvm_amd64
3030
image_file: todo-frontend_jvm_amd64.yaml
31-
runs_on: ubuntu-latest
31+
image_platform: linux/amd64
3232
build-oci-image-jvm-aarch64:
3333
needs: unit-test
3434
uses: making/oauth2-sso-demo/.github/workflows/build-oci-image-jvm.yaml@main
3535
with:
3636
pom_dir: todo-frontend
3737
image_name: todo-frontend_jvm_aarch64
3838
image_file: todo-frontend_jvm_aarch64.yaml
39-
runs_on: raspberrypi
39+
image_platform: linux/arm64
4040
push-multi-arch-image-jvm:
4141
needs:
4242
- build-oci-image-jvm-amd64

0 commit comments

Comments
 (0)