From 57df9504e573d06671215dfbd7607b557ed6bf54 Mon Sep 17 00:00:00 2001
From: Chuck Grindel <chuck.grindel@gmail.com>
Date: Mon, 27 Nov 2023 13:02:34 -0700
Subject: [PATCH] Consolidate bazelrc config to a single action

---
 .github/actions/configure_bazelrc/action.yaml | 26 +++++--
 .../actions/create_bazelrc_tmp/action.yaml    | 26 -------
 .github/workflows/workflow.yaml               | 74 +------------------
 3 files changed, 23 insertions(+), 103 deletions(-)
 delete mode 100644 .github/actions/create_bazelrc_tmp/action.yaml

diff --git a/.github/actions/configure_bazelrc/action.yaml b/.github/actions/configure_bazelrc/action.yaml
index 203638538..284bf92aa 100644
--- a/.github/actions/configure_bazelrc/action.yaml
+++ b/.github/actions/configure_bazelrc/action.yaml
@@ -3,19 +3,35 @@ name: Configure bazelrc file and copy to $HOME/.bazelrc
 inputs:
   bazelrc_path:
     type: string
-    description: The path to the bazelrc file to configure.
-    required: true
+    description: The path to the bazelrc file to use as the starting point.
+    default: '.bazelrc.ci'
 
 runs:
   using: composite
   steps:
-    - shell: bash
+    - id: create_bazelrc_tmp
+      shell: bash
       env:
         BAZELRC: ${{ inputs.bazelrc_path }}
       run: |
-        cat >>"${BAZELRC}" <<EOF
+        bazelrc_tmp="${BAZELRC}.tmp"
+        cp "${BAZELRC}" "${bazelrc_tmp}"
+        echo "bazelrc_tmp=${bazelrc_tmp}" >> "$GITHUB_OUTPUT"
+
+      # DO NOT MERGE!!!
+      # TODO: Update with the correct tagged release.
+    - uses: tweag/configure-bazel-remote-cache-auth@fix_output
+      with:
+        buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
+        bazelrc_path: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
+
+    - shell: bash
+      env:
+        BAZELRC_TMP: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
+      run: |
+        cat >>"${BAZELRC_TMP}" <<EOF
         common --config=ci
         # no-op flag to avoid "ERROR: Config value 'ci' is not defined in any .rc file"
         common:ci --announce_rc=false
         EOF
-        cp "${BAZELRC}" $HOME/.bazelrc
+        cp "${BAZELRC_TMP}" $HOME/.bazelrc
diff --git a/.github/actions/create_bazelrc_tmp/action.yaml b/.github/actions/create_bazelrc_tmp/action.yaml
deleted file mode 100644
index 497bba36f..000000000
--- a/.github/actions/create_bazelrc_tmp/action.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Create temporary bazelrc file
-description: |
-  Create a temporary file that can be modified before being copied to the $HOME directory.
-
-inputs:
-  bazelrc_path:
-    type: string
-    description: The path to the original bazelrc file.
-    required: true
-
-outputs:
-  bazelrc_tmp:
-    description: The path to the temporary .bazelrc file.
-    value: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
-
-runs:
-  using: composite
-  steps:
-    - id: create_bazelrc_tmp
-      shell: bash
-      env:
-        BAZELRC: ${{ inputs.bazelrc_path }}
-      run: |
-        bazelrc_tmp="${BAZELRC}.tmp"
-        cp "${BAZELRC}" "${bazelrc_tmp}"
-        echo "bazelrc_tmp=${bazelrc_tmp}" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index ebdc96b77..21115bf7e 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -34,47 +34,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-        # DO NOT MERGE
-        # TODO: Remove CHUCK DEBUG
-      - name: CHUCK DEBUG 
-        shell: bash
-        run: |
-          echo >&2 "current dir"
-          pwd >&2
-          echo >&2 ".github dir"
-          ls -l .github >&2
-          echo >&2 ".github/actions dir"
-          ls -l .github/actions >&2
-          echo >&2 ".github/actions/create_bazelrc_tmp dir"
-          ls -l .github/actions/create_bazelrc_tmp >&2
-          echo >&2 ".github/actions/configure_bazelrc dir"
-          ls -l .github/actions/configure_bazelrc >&2
       - uses: cachix/install-nix-action@v23
         with:
           nix_path: nixpkgs=./docs/nixpkgs.nix
-      - uses: ./.github/actions/create_bazelrc_tmp
-        id: create_bazelrc_tmp
-        with:
-          bazelrc_path: .bazelrc.ci
-        # DO NOT MERGE!!!
-        # TODO: Update with the correct tagged release.
-      - uses: tweag/configure-bazel-remote-cache-auth@fix_output
-        with:
-          buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
-          bazelrc_path: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
-      - uses: ./.github/actions/configure_bazelrc/action.yaml
-        with:
-          bazelrc_path: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
-      # - name: Configure
-      #   env:
-      #     BAZELRC_TMP: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
-      #   run: |
-      #     cat >>"${BAZELRC_TMP}" <<EOF
-      #     common --config=ci
-      #     # no-op flag to avoid "ERROR: Config value 'ci' is not defined in any .rc file"
-      #     common:ci --announce_rc=false
-      #     EOF
-      #     cp "${BAZELRC_TMP}" $HOME/.bazelrc
+      - uses: ./.github/actions/configure_bazelrc
       - name: Start remote Nix server
         if: matrix.withNixRemote && matrix.os == 'ubuntu-latest'
         run: |
@@ -118,40 +81,7 @@ jobs:
       - uses: cachix/install-nix-action@v23
         with:
           nix_path: nixpkgs=./nixpkgs.nix
-      # - uses: .github/actions/create_bazelrc_tmp
-      #   id: create_bazelrc_tmp
-      #   with:
-      #     bazelrc_path: .bazelrc.ci
-      # - name: Configure
-      #   env:
-      #     BUILDBUDDY_API_KEY: ${{ secrets.BUILDBUDDY_API_KEY }}
-      #   run: |
-      #     cp .bazelrc.ci $HOME/.bazelrc
-      #     cp .bazelrc.ci $HOME/.bazelrc
-      #     if [ -z "$BUILDBUDDY_API_KEY" ]; then
-      #         cache_setting='build --noremote_upload_local_results'
-      #     else
-      #         cache_setting="build --remote_header=x-buildbuddy-api-key=$BUILDBUDDY_API_KEY"
-      #     fi
-      #     cat >>$HOME/.bazelrc <<EOF
-      #     common --config=ci
-      #     $cache_setting
-      #     # no-op flag to avoid "ERROR: Config value 'ci' is not defined in any .rc file"
-      #     common:ci --announce_rc=false
-      #     EOF
-      - uses: ./.github/actions/create_bazelrc_tmp
-        id: create_bazelrc_tmp
-        with:
-          bazelrc_path: .bazelrc.ci
-        # DO NOT MERGE!!!
-        # TODO: Update with the correct tagged release.
-      - uses: tweag/configure-bazel-remote-cache-auth@fix_output
-        with:
-          buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
-          bazelrc_path: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
-      - uses: ./.github/actions/configure_bazelrc/action.yaml
-        with:
-          bazelrc_path: ${{ steps.create_bazelrc_tmp.bazelrc_tmp }}
+      - uses: ./.github/actions/configure_bazelrc
       - name: Build & test
         run: |
           skip() {