fix: build labels and secret detection

Signed-off-by: Sam Gammon <sam@elide.ventures>
sgammon · Aug 14, 2023 · 6268936 · 6268936
1 parent 147b20c
commit 6268936
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/.github/workflows/module.build.yml b/.github/workflows/module.build.yml
@@ -73,9 +73,13 @@ name: "Build"
       BUILDLESS_APIKEY:
         required: false
 
+env:
+  BUILDLESS_APIKEY: ${{ secrets.BUILDLESS_APIKEY }}
+  BUILDBUDDY_APIKEY: ${{ secrets.BUILDBUDDY_APIKEY }}
+
 jobs:
   build:
-    name: "Build: ${{ inputs.label || 'Rules' }}"
+    name: "Build"
     runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
     continue-on-error: ${{ inputs.labs }}
     steps:
@@ -122,7 +126,7 @@ jobs:
         run: bazel build --config=ci "//..."
 
   integration-tests:
-    name: "Test: ${{ matrix.label }} (${{ inputs.label || 'Rules' }})"
+    name: "${{ matrix.label }}"
     runs-on: ${{ inputs.runner || 'ubuntu-latest' }}
     continue-on-error: ${{ inputs.labs || matrix.labs }}
     needs: ["build"]

diff --git a/.github/workflows/on.pr.yml b/.github/workflows/on.pr.yml
@@ -33,7 +33,7 @@ jobs:
           config-file: "./.github/dependency-review-config.yml"
 
   test:
-    name: "Test (${{ matrix.label }})"
+    name: "Test"
     uses: ./.github/workflows/module.build.yml
     strategy:
       fail-fast: false
@@ -43,57 +43,64 @@ jobs:
         bazelversion: ["7.0.0-pre.20230724.1", "6.3.2", "5.4.0"]
         include:
           - runner: ubuntu-latest
-            label: Ubuntu - Bazel 7
+            label: Ubuntu / Bazel 7
             labs: false
             bazelversion: 7.0.0-pre.20230724.1
           - runner: ubuntu-latest
-            label: Ubuntu - Bzlmod 7
+            label: Ubuntu / Bzlmod 7
             bzlmod: true
             labs: true
             bazelversion: 7.0.0-pre.20230724.1
           - runner: windows-latest
-            label: Windows - Bazel 7
+            label: Windows / Bazel 7
             bzlmod: false
             labs: true
             bazelversion: 7.0.0-pre.20230724.1
           - runner: macos-latest
-            label: macOS - Bazel 7
+            label: macOS / Bazel 7
             bzlmod: false
             labs: false
             bazelversion: 7.0.0-pre.20230724.1
           - runner: ubuntu-latest
-            label: Ubuntu - Bazel 6
+            label: Ubuntu / Bazel 6
             labs: false
             bazelversion: 6.3.2
+            bazel_config: bazel6
           - runner: ubuntu-latest
-            label: Ubuntu - Bzlmod 6
+            label: Ubuntu / Bzlmod 6
             bzlmod: true
             labs: true
             bazelversion: 6.3.2
+            bazel_config: bazel6
           - runner: windows-latest
-            label: Windows - Bazel 6
+            label: Windows / Bazel 6
             bzlmod: false
             labs: true
             bazelversion: 6.3.2
+            bazel_config: bazel6
           - runner: macos-latest
-            label: macOS - Bazel 6
+            label: macOS / Bazel 6
             bzlmod: false
             labs: false
             bazelversion: 6.3.2
+            bazel_config: bazel6
           - runner: ubuntu-latest
-            label: Ubuntu - Bazel 5
+            label: Ubuntu / Bazel 5
             labs: true
             bazelversion: 5.4.0
+            bazel_config: bazel5
           - runner: windows-latest
-            label: Windows - Bazel 5
+            label: Windows / Bazel 5
             bzlmod: false
             labs: true
             bazelversion: 5.4.0
+            bazel_config: bazel5
           - runner: macos-latest
-            label: macOS - Bazel 5
+            label: macOS / Bazel 5
             bzlmod: false
             labs: true
             bazelversion: 5.4.0
+            bazel_config: bazel5
 
     secrets: inherit
     with: