Merge pull request #41 from ESKYoung/fix-github-actions-for-patches

Fix GitHub actions for patches
best-practice-and-impact · Jul 19, 2021 · 30fd153 · 30fd153
2 parents 739973e + 1aef790
commit 30fd153
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/govcookiecutter-build.yml b/.github/workflows/govcookiecutter-build.yml
@@ -1,6 +1,6 @@
 name: govcookiecutter build
 
-on: [ push ]
+on: [ push, pull_request ]
 
 jobs:
   build:
@@ -12,7 +12,8 @@ jobs:
         python: [ 3.6, 3.7, 3.8, 3.9 ]
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout the revision
+        uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v2
         with:

diff --git a/.github/workflows/govcookiecutter-template-build.yml b/.github/workflows/govcookiecutter-template-build.yml
@@ -18,6 +18,10 @@ jobs:
           - {using_R: Yes, version: 4.1.0}
 
     steps:
+      - name: Checkout the revision
+        uses: actions/checkout@v2
+        with:
+          path: ga-govcookiecutter
       - name: Set up Python ${{ matrix.python }}
         uses: actions/setup-python@v2
         with:
@@ -45,9 +49,7 @@ jobs:
           fi;
         shell: bash
       - name: Create project from govcookiecutter for this commit
-        run: |
-          # Relies on the repository being public
-          cookiecutter ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git --no-input --checkout ${GITHUB_HEAD_REF} repo_name=example using_R=${{ matrix.R.using_R }}
+        run: cookiecutter ga-govcookiecutter --no-input repo_name=example using_R=${{ matrix.R.using_R }}
         shell: bash
       - name: Install requirements, and pre-commit hooks, and check Sphinx build
         run: |