From 09ef1bce5c28f846addf217f6d868409a75ce93c Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Sat, 22 Jun 2024 00:13:29 +1000 Subject: [PATCH 1/3] fix pathing in updating cookie repo --- .github/actions/push-to-cookie/action.yaml | 6 +++--- .github/workflows/gh-ci.yaml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/push-to-cookie/action.yaml b/.github/actions/push-to-cookie/action.yaml index 201ac1ce..e4d799b5 100644 --- a/.github/actions/push-to-cookie/action.yaml +++ b/.github/actions/push-to-cookie/action.yaml @@ -4,8 +4,8 @@ inputs: source-directory: description: Source directory required: true - target-branch: - description: Target branch + source-package: + description: Source package name required: true target-repository: description: Target repository name @@ -53,7 +53,7 @@ runs: cp -r ${{ inputs.source-directory }} ${HOME}/cookies cd ${HOME}/cookies - for mdakit_directory in $(ls -d */${{ inputs.target-repository }}) ; do + for mdakit_directory in $(ls -d */${{ inputs.source-package }}) ; do TARGET_BRANCH=$(dirname $mdakit_directory) echo "Target branch: ${TARGET_BRANCH}" diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index b487f76f..4163f26c 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.github/workflows/gh-ci.yaml @@ -110,6 +110,8 @@ jobs: uses: ./.github/actions/push-to-cookie with: source-directory: ${{ env.OUTPUT_DIRECTORY }} + target-repository: mdakit-cookie + source-package: mdakit-Cookie target-ssh-deploy-key: ${{ secrets.MDAKIT_COOKIE_SSH_DEPLOY_KEY }} - name: Push to remote From acfb72353c416ff8a4729d6ac5f77145a4bf6294 Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Sat, 22 Jun 2024 00:13:56 +1000 Subject: [PATCH 2/3] tmp allow during pull request --- .github/workflows/gh-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index 4163f26c..dca210c8 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.github/workflows/gh-ci.yaml @@ -91,7 +91,7 @@ jobs: retention-days: 3 update-repo-examples: - if: github.event_name != 'pull_request' + # if: github.event_name != 'pull_request' needs: cookiecutter-main-tests runs-on: ubuntu-latest steps: From acd6d1000434114e7d5f0e1220f6a37538ea4c2b Mon Sep 17 00:00:00 2001 From: Lily Wang Date: Sat, 22 Jun 2024 12:05:18 +1000 Subject: [PATCH 3/3] Revert "tmp allow during pull request" This reverts commit acfb72353c416ff8a4729d6ac5f77145a4bf6294. --- .github/workflows/gh-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-ci.yaml b/.github/workflows/gh-ci.yaml index dca210c8..4163f26c 100644 --- a/.github/workflows/gh-ci.yaml +++ b/.github/workflows/gh-ci.yaml @@ -91,7 +91,7 @@ jobs: retention-days: 3 update-repo-examples: - # if: github.event_name != 'pull_request' + if: github.event_name != 'pull_request' needs: cookiecutter-main-tests runs-on: ubuntu-latest steps: