Merge pull request #8 from MDavidson17/feat/test-6

Feat/test 6
MDavidson17 · Sep 22, 2023 · 8f5c8e2 · 8f5c8e2
2 parents f2be521 + fe89ff9
commit 8f5c8e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/publish-test.yaml b/.github/workflows/publish-test.yaml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   main:
-    if: ${{ github.event.pull_request.merged == true }} && ${{github.event.label.name == 'publish-odr*'}}
+    if: ${{ github.event.pull_request.merged == true }} #&& ${{github.event.label.name == 'publish-odr*'}}
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -74,7 +74,7 @@ jobs:
         # if: ${{ github.event.label.name == 'publish-odr-added-only'}}
         id: added-files
         run: |
-          git diff --name-status ${{ github.event.before }} ${{ github.event.after }} | grep ^A
+          git diff --name-status ${{ github.event.pull_request.base.rfa }} ${{ github.event.pull_request.base.sha }} | grep ^A
           echo "added_files=$(git diff --name-status ${{ github.event.before }} ${{ github.event.after }} | grep ^A)" >> $GITHUB_OUTPUT
 
       # - name: Submit Added Workflow(s) Only

diff --git a/workflow-parameters/test copy 6.yaml b/workflow-parameters/test copy 6.yaml
@@ -0,0 +1,2 @@
+"source":"s3://linz-imagery-staging/test/"
+"target":"s3://linz-workflow-artifacts/mdavidson/"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		"source":"s3://linz-imagery-staging/test/"
		"target":"s3://linz-workflow-artifacts/mdavidson/"