Update CI files

[noissue]
pulp · Nov 15, 2023 · b9d5fb2 · b9d5fb2
1 parent 0de3383
commit b9d5fb2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/.github/template_gitref b/.github/template_gitref
@@ -1 +1 @@
-2021.08.26-256-gf3e24c8
+2021.08.26-259-ge0f38f0
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -24,6 +24,7 @@ jobs:
 
   test:
     runs-on: ubuntu-latest
+    needs: build
 
     strategy:
       fail-fast: false
@@ -33,7 +34,7 @@ jobs:
           - TEST: docs
           - TEST: azure
           - TEST: s3
-
+          
           - TEST: generate-bindings
           - TEST: lowerbounds
 
@@ -42,15 +43,15 @@ jobs:
         with:
           fetch-depth: 1
 
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.8"
-
       - uses: actions/download-artifact@v3
         with:
           name: plugin_package
           path: dist/
 
+      - uses: actions/setup-python@v4
+        with:
+          python-version: "3.8"
+
       - name: Install httpie
         run: |
           echo ::group::HTTPIE
@@ -219,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"
@@ -297,7 +303,7 @@ jobs:
         env:
           SECRETS_CONTEXT: ${{ toJson(secrets) }}
 
-
+      
       - name: Download built docs
         uses: actions/download-artifact@v3
         with:
@@ -312,7 +318,7 @@ jobs:
         run: |
           tar -xvf docs.tar -C ./docs
           .github/workflows/scripts/publish_docs.sh nightly ${GITHUB_REF##*/}
-
+      
 
       - name: Logs
         if: always()

diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
@@ -36,22 +36,27 @@ jobs:
       - 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