👷 Fix make release (#3276)

Fusion-Power-Plant-Framework · May 14, 2024 · 9b6f12b · 9b6f12b
1 parent 6d64073
commit 9b6f12b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/.github/workflows/actions/dependencies_PR/action.yml b/.github/workflows/actions/dependencies_PR/action.yml
@@ -10,10 +10,11 @@ inputs:
 
 runs:
   using: "composite"
-  env:
-    GITHUB_TOKEN: ${{ inputs.token }}
   steps:
     - name: Rebase develop_dependencies
+      env:
+        GITHUB_TOKEN: ${{ inputs.token }}
+      shell: bash -l {0}
       run: |
         # Rebase develop_dependencies on develop, so that it's up-to-date and
         # we don't run into conflicts next time we merge.
@@ -23,6 +24,9 @@ runs:
         git push --force-with-lease origin develop_dependencies:develop_dependencies
 
     - name: Create PR to update dependencies
+      env:
+        GITHUB_TOKEN: ${{ inputs.token }}
+      shell: bash -l {0}
       run: |
         PR_URL=$(gh pr create \
           --head develop_dependencies \

diff --git a/.github/workflows/actions/permission_check/action.yml b/.github/workflows/actions/permission_check/action.yml
@@ -6,15 +6,14 @@ inputs:
     type: string
 
 
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Permissions Test
-        env:
-          GITHUB_TOKEN: ${{ inputs.token }}
-        shell: bash
-        run: |
+runs:
+  using: "composite"
+  steps:
+    - name: Permissions Test
+      env:
+        GITHUB_TOKEN: ${{ inputs.token }}
+      shell: bash
+      run: |
           role_type="$(gh api /orgs/${{ github.repository_owner }}/memberships/${{ github.actor }} --jq '.role')"
           if [[ $role_type != 'admin' ]]; then
             exit 1

diff --git a/.github/workflows/dependencies_pr.yml b/.github/workflows/dependencies_pr.yml
@@ -10,15 +10,16 @@ on:
 
 jobs:
   dep_pr:
+    runs-on: ubuntu-latest
     steps:
-      - name: Permissions Check
-        uses: ./.github/workflows/actions/permission_check
-        with:
-          token: ${{ secrets.FPPF_BOT_AUTH_KEY }}
       - name: Checkout
         uses: actions/checkout@v4
         with:
           token: ${{ secrets.FPPF_BOT_AUTH_KEY }}
+      - name: Permissions Check
+        uses: ./.github/workflows/actions/permission_check
+        with:
+          token: ${{ secrets.FPPF_BOT_AUTH_KEY }}
       - name: Open develop_dependencies PR
         uses: ./.github/workflows/actions/dependencies_PR
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,13 +28,13 @@ jobs:
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - name: Permissions Check
-        uses: ./.github/workflows/actions/permission_check
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.FPPF_BOT_AUTH_KEY }}
 
-      - name: Checkout
-        uses: actions/checkout@v4
+      - name: Permissions Check
+        uses: ./.github/workflows/actions/permission_check
         with:
           token: ${{ secrets.FPPF_BOT_AUTH_KEY }}