Attempts to fix some issues with workflow

MonsterDruide1 · Feb 27, 2024 · 109fd17 · 109fd17
1 parent adade9f
commit 109fd17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/clean-headers.yml b/.github/workflows/clean-headers.yml
@@ -24,10 +24,13 @@ jobs:
       run: |
         if [[ $GITHUB_EVENT_NAME == 'pull_request_target' ]]
         then
+          echo "REF: $GITHUB_REF_NAME, attempted match: `expr match "$GITHUB_REF_NAME" '.*\(^[0-9]*\)/'`"
           echo "HEADER_BRANCH=pr-`expr match "$GITHUB_REF_NAME" '.*\(^[0-9]*\)/'`" >> "$GITHUB_ENV"
         else
-          echo "HEADER_BRANCH=$GITHUB_REF_NAME" >> "$GITHUB_ENV"
+          echo "HEADER_BRANCH=$DELETED_BRANCH" >> "$GITHUB_ENV"
         fi
+      env:
+        DELETED_BRANCH: ${{ github.event.ref }}
     - name: Delete branch from OdysseyHeaders
       run: |
         cd OdysseyHeaders

diff --git a/.github/workflows/copy-headers.yml b/.github/workflows/copy-headers.yml
@@ -34,6 +34,7 @@ jobs:
       run: |
         if [[ $GITHUB_EVENT_NAME == 'pull_request_target' ]]
         then
+          echo "REF: $GITHUB_REF_NAME, attempted match: `expr match "$GITHUB_REF_NAME" '.*\(^[0-9]*\)/'`"
           echo "HEADER_BRANCH=pr-`expr match "$GITHUB_REF_NAME" '.*\(^[0-9]*\)/'`" >> "$GITHUB_ENV"
         else
           echo "HEADER_BRANCH=$GITHUB_REF_NAME" >> "$GITHUB_ENV"

diff --git a/.github/workflows/progress.yml b/.github/workflows/progress.yml
@@ -13,7 +13,7 @@ jobs:
       with:
         submodules: recursive
     - name: Set up dependencies
-      run: sudo apt install -y ninja-build cmake ccache clang curl libncurses5
+      run: sudo apt update && sudo apt install -y ninja-build cmake ccache clang curl libncurses5
     - name: Set up python
       uses: actions/setup-python@v4
       with: