Update CI files

[noissue]
pulp · Nov 15, 2023 · e6860ff · e6860ff
1 parent 5e2a94b
commit e6860ff
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-255-g20bf8c0
+2021.08.26-259-ge0f38f0
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -19,8 +19,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  build:
+    uses: ./.github/workflows/build.yml
+
   test:
     runs-on: ubuntu-latest
+    needs: build
 
     strategy:
       fail-fast: false
@@ -39,6 +43,11 @@ jobs:
         with:
           fetch-depth: 1
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: plugin_package
+          path: dist/
+
       - uses: actions/setup-python@v4
         with:
           python-version: "3.8"
@@ -211,6 +220,11 @@ jobs:
         with:
           fetch-depth: 1
 
+      - uses: actions/download-artifact@v3
+        with:
+          name: plugin_package
+          path: dist/
+
       - uses: actions/setup-python@v4
         with:
           python-version: "3.8"

diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
@@ -30,26 +30,33 @@ jobs:
         with:
           fetch-depth: 0
       - name: Commit Count Check
-        run: echo "COMMIT_COUNT=$(git log  --oneline --no-merges origin/${{ github.base_ref }}..${{ github.event.pull_request.head.sha }} | wc -l)" >> "$GITHUB_ENV"
+        run: |
+          git fetch origin ${{ github.event.pull_request.head.sha }}
+          echo "COMMIT_COUNT=$(git log  --oneline --no-merges origin/${{ github.base_ref }}..${{ github.event.pull_request.head.sha }} | wc -l)" >> "$GITHUB_ENV"
       - uses: actions/github-script@v7
         with:
           script: |
-            const { COMMIT_COUNT } = process.env
+            const labelName = "multi-commit";
+            const { COMMIT_COUNT } = process.env;
+
             if (COMMIT_COUNT == 1)
             {
-              github.rest.issues.removeLabel({
-                issue_number: context.issue.number,
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                name: ["multi-commit"]
-              })
+              try {
+                await github.rest.issues.removeLabel({
+                  issue_number: context.issue.number,
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  name: labelName,
+                });
+              } catch(err) {
+              }
             }
             else
             {
-              github.rest.issues.addLabels({
+              await github.rest.issues.addLabels({
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                labels: ["multi-commit"]
-              })
+                labels: [labelName],
+              });
             }
diff --git a/docs/template_gitref b/docs/template_gitref
@@ -1 +1 @@
-2021.08.26-255-g20bf8c0
+2021.08.26-259-ge0f38f0