Fixed file names in CI. (#65)

drevops · Feb 27, 2024 · b714d87 · b714d87
1 parent f40dbbe
commit b714d87
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 25 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -84,8 +84,10 @@ jobs:
           name: Prepare test file.
           command: |
             export TEST_FILE="test-file--force-push--circleci--${CIRCLE_BRANCH//\//-}.txt"
-            echo "Deployment 1 for branch $CIRCLE_BRANCH" >> $TEST_FILE
+            echo "Deployment 1 for branch $CIRCLE_BRANCH" > $TEST_FILE
             date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+            cat $TEST_FILE
+            echo $TEST_FILE > $HOME/test-file.txt
 
       - run:
           name: Deployment 1
@@ -101,15 +103,16 @@ jobs:
             DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--force-push.txt | sed 's/ //g')
             echo "Deployed to $DEPLOYED_BRANCH"
             echo
-            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"
             rm $HOME/report--mode--force-push.txt
 
       - run:
           name: Update the test file to simulate changes in the source repository.
           command: |
-            export TEST_FILE="test-file--branch--circleci--${CIRCLE_BRANCH//\//-}.txt"
+            export TEST_FILE="test-file--force-push--circleci--${CIRCLE_BRANCH//\//-}.txt"
             echo "Deployment 2 for branch $CIRCLE_BRANCH" >> $TEST_FILE
             date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+            cat $TEST_FILE
 
       - run:
           name: Deployment 2
@@ -125,7 +128,7 @@ jobs:
             DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--force-push.txt | sed 's/ //g')
             echo "Deployed to $DEPLOYED_BRANCH"
             echo
-            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"
 
   # Demonstration of deployment in 'branch' mode.
   # Note that by design, pushing into the same branch will result in the failure
@@ -155,8 +158,10 @@ jobs:
           name: Prepare test file.
           command: |
             export TEST_FILE="test-file--branch--circleci--${CIRCLE_BRANCH//\//-}.txt"
-            echo "Deployment 1 for branch $CIRCLE_BRANCH" >> $TEST_FILE
+            echo "Deployment 1 for branch $CIRCLE_BRANCH" > $TEST_FILE
             date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+            cat $TEST_FILE
+            echo $TEST_FILE > $HOME/test-file.txt
 
       - run:
           name: Deployment 1
@@ -172,16 +177,9 @@ jobs:
             DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--branch.txt | sed 's/ //g')
             echo "Deployed to $DEPLOYED_BRANCH"
             echo
-            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"
             rm $HOME/report--mode--branch.txt
 
-      - run:
-          name: Update the test file to simulate changes in the source repository.
-          command: |
-            export TEST_FILE="test-file--branch--circleci--${CIRCLE_BRANCH//\//-}.txt"
-            echo "Deployment 2 for branch $CIRCLE_BRANCH" >> $TEST_FILE
-            date "+%Y%m%d-%H%M%S" >> $TEST_FILE
-
       - run:
           name: Deployment 2 - same branch
           command: |
@@ -194,6 +192,14 @@ jobs:
               --debug \
               && { echo "Expected to fail as repeated pushes to the same branch are not allowed, but succeeded" >&2; exit 1; } || echo "Failed as expected"
 
+      - run:
+          name: Update the test file to simulate changes in the source repository.
+          command: |
+            export TEST_FILE="test-file--branch--circleci--${CIRCLE_BRANCH//\//-}.txt"
+            echo "Deployment 2 for branch $CIRCLE_BRANCH" > $TEST_FILE
+            date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+            cat $TEST_FILE
+
       - run:
           name: Deployment 2 - new branch
           command: |
@@ -208,7 +214,7 @@ jobs:
             DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--branch.txt | sed 's/ //g')
             echo "Deployed to $DEPLOYED_BRANCH"
             echo
-            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+            echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"
 
 workflows:
   version: 2

diff --git a/.github/workflows/test-php.yml b/.github/workflows/test-php.yml
@@ -73,7 +73,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GITHUB_BRANCH: ${{ github.head_ref }}
+      GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }}
 
     steps:
       - name: Checkout code
@@ -116,8 +116,10 @@ jobs:
       - name: Prepare test file.
         run: |
           export TEST_FILE="test-file--force-push--gha--${GITHUB_BRANCH//\//-}.txt"
-          echo "Deployment 1 for branch $GITHUB_BRANCH" >> $TEST_FILE
+          echo "Deployment 1 for branch $GITHUB_BRANCH" > $TEST_FILE
           date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+          cat $TEST_FILE
+          echo $TEST_FILE > $HOME/test-file.txt
 
       - name: Deployment 1
         run: |
@@ -132,14 +134,15 @@ jobs:
           DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--force-push.txt | sed 's/ //g')
           echo "Deployed to $DEPLOYED_BRANCH"
           echo
-          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"
           rm $HOME/report--mode--force-push.txt
 
       - name: Update the test file to simulate changes in the source repository.
         run: |
-          export TEST_FILE="test-file--branch--gha--${GITHUB_BRANCH//\//-}.txt"
-          echo "Deployment 2 for branch $GITHUB_BRANCH" >> $TEST_FILE
+          export TEST_FILE="test-file--force-push--gha--${GITHUB_BRANCH//\//-}.txt"
+          echo "Deployment 2 for branch $GITHUB_BRANCH" > $TEST_FILE
           date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+          cat $TEST_FILE
 
       - name: Deployment 2
         run: |
@@ -154,7 +157,7 @@ jobs:
           DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--force-push.txt | sed 's/ //g')
           echo "Deployed to $DEPLOYED_BRANCH"
           echo
-          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"
 
   # Demonstration of deployment in 'branch' mode.
   # Note that by design, pushing into the same branch will result in the failure
@@ -166,7 +169,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      GITHUB_BRANCH: ${{ github.head_ref }}
+      GITHUB_BRANCH: ${{ github.head_ref || github.ref_name }}
 
     steps:
       - name: Checkout code
@@ -213,8 +216,10 @@ jobs:
       - name: Prepare test file.
         run: |
           export TEST_FILE="test-file--branch--gha--${GITHUB_BRANCH//\//-}.txt"
-          echo "Deployment 1 for branch $GITHUB_BRANCH" >> $TEST_FILE
+          echo "Deployment 1 for branch $GITHUB_BRANCH" > $TEST_FILE
           date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+          cat $TEST_FILE
+          echo $TEST_FILE > $HOME/test-file.txt
 
       - name: Deployment 1
         run: |
@@ -229,14 +234,15 @@ jobs:
           DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--branch.txt | sed 's/ //g')
           echo "Deployed to $DEPLOYED_BRANCH"
           echo
-          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"
           rm $HOME/report--mode--branch.txt
 
       - name: Update the test file to simulate changes in the source repository.
         run: |
           export TEST_FILE="test-file--branch--gha--${GITHUB_BRANCH//\//-}.txt"
-          echo "Deployment 2 for branch $GITHUB_BRANCH" >> $TEST_FILE
+          echo "Deployment 2 for branch $GITHUB_BRANCH" > $TEST_FILE
           date "+%Y%m%d-%H%M%S" >> $TEST_FILE
+          cat $TEST_FILE
 
       - name: Deployment 2 - same branch
         run: |
@@ -262,4 +268,4 @@ jobs:
           DEPLOYED_BRANCH=$(sed -n 's/Remote branch://p' $HOME/report--mode--branch.txt | sed 's/ //g')
           echo "Deployed to $DEPLOYED_BRANCH"
           echo
-          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$TEST_FILE"
+          echo "See https://github.com/drevops/git-artifact-destination/blob/$DEPLOYED_BRANCH/$(cat $HOME/test-file.txt)"