Updating workflows

kbase · Apr 9, 2024 · c82b29d · c82b29d
1 parent b52f66f
commit c82b29d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 23 deletions.
diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
@@ -12,45 +12,35 @@ on:
       - synchronize
       - closed
 jobs:
-  set-platforms:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set platforms
-        id: set-platforms
-        run: | 
-          echo "PLATFORMS=linux/amd64,linux/arm64/v8" >> $GITHUB_ENV
-          echo "Set PLATFORMS to: ${{ env.PLATFORMS }}"
-    outputs:
-      platforms: ${{ env.PLATFORMS }}
   build-develop-open:
     if: github.base_ref == 'develop' && github.event.pull_request.merged == false
     uses: kbase/.github/.github/workflows/reusable_build.yml@multi-target
     with:
-      platforms: ${{ needs.set-platforms.outputs.platforms }}
+      platforms: "linux/amd64,linux/arm64/v8"
     secrets: inherit
   build-develop-merge:
     if: github.base_ref == 'develop' && github.event.pull_request.merged == true
     uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target
     with:
       name: '${{ github.event.repository.name }}-develop'
       tags: pr-${{ github.event.number }},latest
-      platforms: ${{ needs.set-platforms.outputs.platforms }}
+      platforms: "linux/amd64,linux/arm64/v8"
     secrets: inherit
   build-main-open:
     if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == false
     uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target
     with:
       name: '${{ github.event.repository.name }}'
       tags: pr-${{ github.event.number }}
-      platforms: ${{ needs.set-platforms.outputs.platforms }}
+      platforms: "linux/amd64,linux/arm64/v8"
     secrets: inherit
   build-main-merge:
     if: (github.base_ref == 'main' || github.base_ref == 'master') && github.event.pull_request.merged == true
     uses: kbase/.github/.github/workflows/reusable_build-push.yml@multi-target
     with:
       name: '${{ github.event.repository.name }}'
       tags: pr-${{ github.event.number }},latest-rc
-      platforms: ${{ needs.set-platforms.outputs.platforms }}
+      platforms: "linux/amd64,linux/arm64/v8"
     secrets: inherit
   trivy-scans:
     if: (github.base_ref == 'develop' || github.base_ref == 'main' || github.base_ref == 'master' ) && github.event.pull_request.merged == false

diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
@@ -7,14 +7,6 @@ on:
       - master
     types: [ published ]
 jobs:
-  set-platforms:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set platforms
-        id: set-platforms
-        run: echo "PLATFORMS=linux/amd64,linux/arm64/v8" >> $GITHUB_ENV
-    outputs:
-      platforms: ${{ env.PLATFORMS }}
   check-source-branch:
     uses: kbase/.github/.github/workflows/reusable_validate-branch.yml@multi-target
     with:
@@ -30,5 +22,5 @@ jobs:
     with:
       name: '${{ github.event.repository.name }}'
       tags: '${{ github.event.release.tag_name }},latest'
-      platforms: ${{ needs.set-platforms.outputs.platforms }}
+      platforms: "linux/amd64,linux/arm64/v8"
     secrets: inherit