fix checkout code

hashicorp · Aug 22, 2023 · 2f85a48 · 2f85a48
1 parent 06606db
commit 2f85a48
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/nightly-test-integrations-1.16.x.yml b/.github/workflows/nightly-test-integrations-1.16.x.yml
@@ -4,10 +4,11 @@
 name: Nightly test-integrations 1.16.x
 
 on:
-  schedule:
-    # Run nightly at 1AM UTC/9PM EST/6PM PST
-    - cron: '* 1 * * *'
-  workflow_dispatch: {}
+  pull_request:
+  # schedule:
+  #   # Run nightly at 1AM UTC/9PM EST/6PM PST
+  #   - cron: '* 1 * * *'
+  # workflow_dispatch: {}
 
 env:
   TEST_RESULTS_DIR: /tmp/test-results

diff --git a/.github/workflows/reusable-dev-build.yml b/.github/workflows/reusable-dev-build.yml
@@ -17,7 +17,7 @@ on:
       branch-name:
           required: false
           type: string
-          default: "main"
+          default: ""
       go-arch:
         required: false
         type: string
@@ -29,10 +29,14 @@ jobs:
   build:
     runs-on: ${{ fromJSON(inputs.runs-on) }}
     steps:
-      - name: Checkout code
+      - name: Checkout code ${{ inputs.branch-name }}
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
         with:
           ref: ${{ inputs.branch-name }}
+        if: inputs.branch-name != ''
+      - name: Checkout code
+        uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+        if: inputs.branch-name == ''
       # NOTE: This step is specifically needed for ENT. It allows us to access the required private HashiCorp repos.
       - name: Setup Git
         if: ${{ endsWith(inputs.repository-name, '-enterprise') }}