From c82b29dcc0712d42e421601d072bb9451ca53cc3 Mon Sep 17 00:00:00 2001
From: JS Fillman <jsfillman@lbl>
Date: Tue, 9 Apr 2024 15:46:14 -0700
Subject: [PATCH] Updating workflows

---
 .github/workflows/pr_build.yml     | 18 ++++--------------
 .github/workflows/release-main.yml | 10 +---------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 3265570..b399fa4 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -12,21 +12,11 @@ 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
@@ -34,7 +24,7 @@ jobs:
     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
@@ -42,7 +32,7 @@ jobs:
     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
@@ -50,7 +40,7 @@ jobs:
     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
index a23adaa..66bf1ce 100644
--- 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