Test.

diff --git a/.github/workflows/docker-build-releases.yaml b/.github/workflows/docker-build-releases.yaml
index 9d695d99a212b58f2b87239bec7f0ae54ebb966c..e664d7a9877ed6902f5b2aa91e0290c091c7c0fc 100644 (file)
--- a/.github/workflows/docker-build-releases.yaml
+++ b/.github/workflows/docker-build-releases.yaml
@@ -24,14 +24,11 @@ jobs:
 
       - name: Determine NQPTP env (part 1).
         if: ${{ env.SHAIRPORT_SYNC_BRANCH == 'development' }}
-        env:
-          NQPTP_BRANCH: development
+        run: echo "NQPTP_BRANCH=development" >> $GITHUB_ENV
       
       - name: Determine NQPTP env (part 2).
         if: ${{ env.SHAIRPORT_SYNC_BRANCH != 'development' }}
-        env:
-          NQPTP_BRANCH: master
-
+        run: echo "NQPTP_BRANCH=master" >> $GITHUB_ENV
         
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -56,6 +53,7 @@ jobs:
           tags: ${{ secrets.DOCKER_REGISTRY }}/shairport-sync:latest ${{ secrets.DOCKER_REGISTRY }}/shairport-sync:${{ github.event.release.tag_name }}
           build-args: |
             SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
+            NQPTP_BRANCH=${{ env.NQPTP_BRANCH }}
 
       - name: Build and push (AirPlay 1)
         uses: docker/build-push-action@v2

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 01435a89f0459847786630579299103ed78a2731..b3d8eebb9e186defb7ab18965860c78a2ea6abda 100644 (file)
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -22,13 +22,11 @@ jobs:
 
       - name: Determine NQPTP env (part 1).
         if: ${{ env.SHAIRPORT_SYNC_BRANCH == 'development' }}
-        env:
-          NQPTP_BRANCH: development
+        run: echo "NQPTP_BRANCH=development" >> $GITHUB_ENV
       
       - name: Determine NQPTP env (part 2).
         if: ${{ env.SHAIRPORT_SYNC_BRANCH != 'development' }}
-        env:
-          NQPTP_BRANCH: master
+        run: echo "NQPTP_BRANCH=master" >> $GITHUB_ENV
         
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -53,6 +51,7 @@ jobs:
           tags: ${{ secrets.DOCKER_REGISTRY }}/shairport-sync:unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}
           build-args: |
             SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }}
+            NQPTP_BRANCH=${{ env.NQPTP_BRANCH }}
 
       - name: Build and push (AirPlay 1)
         uses: docker/build-push-action@v2