Merge pull request #240 from Fryguy/fix_travis_env

Fix TRAVIS env vars (cherry picked from commit 44fbe20)
ManageIQ · Jan 25, 2022 · ae49f8e · ae49f8e
1 parent 72d9160
commit ae49f8e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -24,13 +24,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
+    - name: Set TRAVIS ENV variables
+      run: |
+        echo "TRAVIS_PULL_REQUEST=${{ github.event.number || false }}" >> $GITHUB_ENV
+        TRAVIS_BRANCH="${{ github.head_ref }}" && \
+          echo "TRAVIS_BRANCH=${TRAVIS_BRANCH:-$(echo $GITHUB_REF | cut -d '/' -f 3-)}" >> $GITHUB_ENV
     - name: Set up registry credentials
       if: ${{ github.event_name != 'pull_request' }}
       run: |
         echo "REGISTRY_USERNAME=${{ secrets.REGISTRY_USERNAME }}" >> $GITHUB_ENV
         echo "REGISTRY_PASSWORD=${{ secrets.REGISTRY_PASSWORD }}" >> $GITHUB_ENV
     - name: Run container build script
       run: bin/build_container_image
-      env:
-        TRAVIS_PULL_REQUEST: ${{ github.event_name == 'pull_request' && 'true' || 'false' }}
-        TRAVIS_BRANCH: ${{ env.GITHUB_REF_NAME }}