split to workflow files

GoogleCloudPlatform · Nov 3, 2023 · 39b148c · 39b148c
1 parent 72a028f
commit 39b148c
Show file tree

Hide file tree

Showing 4 changed files with 253 additions and 206 deletions.
diff --git a/.github/workflows/build-downstream.yml b/.github/workflows/build-downstream.yml
@@ -0,0 +1,114 @@
+name: build-downstream
+permissions: read-all
+
+on:
+  workflow_call:
+    inputs:
+      repo:
+        description: 'Repository to build'
+        required: true
+        type: string
+
+concurrency:
+  group: ${{ inputs.repo  }}-${{ github.event_name == 'pull_request' && format('pr-{0}-', github.event.pull_request.number) || format('commit-{0}', github.sha) }}
+  cancel-in-progress: true
+
+jobs:
+  build-downstreams:
+    runs-on: ubuntu-22.04
+    env:
+      BASE_BRANCH: ${{ github.event.pull_request.base.ref || github.ref }}
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
+        with:
+          ruby-version: '3.1'
+
+      - name: Cache Bundler gems
+        uses: actions/cache@v2
+        with:
+          path: mmv1/vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('mmv1/**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      - name: Install Ruby dependencies
+        run: |
+          bundle config path mmv1/vendor/bundle
+          bundle install
+        working-directory: mmv1
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '^1.19'
+
+      # Cache Go modules
+      - name: Cache Go modules
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - run: go install golang.org/x/tools/cmd/goimports@latest
+
+      - name: Build ${{ inputs.repo  }}
+        run: |
+          set -e
+          set -x
+          # Set GOPATH to a directory the runner user has access to
+          export GOPATH=~/go
+
+          function clone_repo() {
+            export OUTPUT_PATH=$GOPATH/src/github.com/$UPSTREAM_OWNER/$GH_REPO
+            GITHUB_PATH=https://x-access-token:[email protected]/$UPSTREAM_OWNER/$GH_REPO
+            mkdir -p "$(dirname $OUTPUT_PATH)"
+            git clone $GITHUB_PATH $OUTPUT_PATH --branch $BASE_BRANCH
+          }
+
+          GH_REPO="${{ inputs.repo  }}"
+          if [ "$GH_REPO" == "docs-examples" ] && [ "$BASE_BRANCH" == "main" ]; then
+              BASE_BRANCH="master"
+          fi
+
+          GITHUB_PATH=https://x-access-token:[email protected]/$UPSTREAM_OWNER/$GH_REPO
+
+          if [[ "$GH_REPO" == terraform-provider-google* ]]; then
+            UPSTREAM_OWNER=hashicorp
+            clone_repo
+          if [ "$GH_REPO" == "terraform-provider-google" ]; then
+              export VERSION=ga
+            else
+              export VERSION=beta
+            fi
+            make clean-provider
+            make provider
+          elif [ "$GH_REPO" == "terraform-google-conversion" ]; then
+            UPSTREAM_OWNER=GoogleCloudPlatform
+            clone_repo
+            make clean-tgc
+            make tgc
+          elif [ "$GH_REPO" == "docs-examples" ]; then
+            UPSTREAM_OWNER=terraform-google-modules
+            clone_repo
+            make tf-ocis
+          else
+            echo "case not supported"
+            exit 1
+          fi
+
+          (current_dir=$(pwd) && cd $OUTPUT_PATH && zip -r "$current_dir/output.zip" .)
+
+      - name: Upload built artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: artifact-${{ inputs.repo  }}
+          path: output.zip
diff --git a/.github/workflows/downstreams.yml b/.github/workflows/downstreams.yml
@@ -12,213 +12,37 @@ concurrency:
   group: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || format('commit-{0}', github.sha) }}
   cancel-in-progress: true
 
-# concurrency:
-#   group: downstreams-${{ github.event.inputs.owner }}-${{ github.event.inputs.repo }}-${{ github.event.inputs.branch }}
-#   cancel-in-progress: true
-
-
 jobs:
-  build-downstreams:
-    name: ${{ matrix.repo }}
-    strategy:
-      fail-fast: false
-      matrix:
-        repo: ['terraform-provider-google', 'terraform-provider-google-beta', 'terraform-google-conversion', 'docs-examples']
-    runs-on: ubuntu-22.04
-    env:
-      BASE_BRANCH: ${{ github.event.pull_request.base.ref || github.ref }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@ec02537da5712d66d4d50a0f33b7eb52773b5ed1
-        with:
-          ruby-version: '3.1'
-
-      - name: Cache Bundler gems
-        uses: actions/cache@v2
-        with:
-          path: mmv1/vendor/bundle
-          key: ${{ runner.os }}-gems-${{ hashFiles('mmv1/**/Gemfile.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-gems-
-
-      - name: Install Ruby dependencies
-        run: |
-          bundle config path mmv1/vendor/bundle
-          bundle install
-        working-directory: mmv1
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '^1.19'
-
-      # Cache Go modules
-      - name: Cache Go modules
-        uses: actions/cache@v2
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
-      - run: go install golang.org/x/tools/cmd/goimports@latest
-
-      - name: Build ${{ matrix.repo }}
-        run: |
-          set -e
-          set -x
-          # Set GOPATH to a directory the runner user has access to
-          export GOPATH=~/go
-
-          function clone_repo() {
-            export OUTPUT_PATH=$GOPATH/src/github.com/$UPSTREAM_OWNER/$GH_REPO
-            GITHUB_PATH=https://x-access-token:[email protected]/$UPSTREAM_OWNER/$GH_REPO
-            mkdir -p "$(dirname $OUTPUT_PATH)"
-            git clone $GITHUB_PATH $OUTPUT_PATH --branch $BASE_BRANCH
-          }
-
-          GH_REPO="${{ matrix.repo }}"
-          if [ "$GH_REPO" == "docs-examples" ] && [ "$BASE_BRANCH" == "main" ]; then
-              BASE_BRANCH="master"
-          fi
-
-          GITHUB_PATH=https://x-access-token:[email protected]/$UPSTREAM_OWNER/$GH_REPO
-
-          if [[ "$GH_REPO" == terraform-provider-google* ]]; then
-            UPSTREAM_OWNER=hashicorp
-            clone_repo
-          if [ "$GH_REPO" == "terraform-provider-google" ]; then
-              export VERSION=ga
-            else
-              export VERSION=beta
-            fi
-            make clean-provider
-            make provider
-          elif [ "$GH_REPO" == "terraform-google-conversion" ]; then
-            UPSTREAM_OWNER=GoogleCloudPlatform
-            clone_repo
-            make clean-tgc
-            make tgc
-          elif [ "$GH_REPO" == "docs-examples" ]; then
-            UPSTREAM_OWNER=terraform-google-modules
-            clone_repo
-            make tf-ocis
-          else
-            echo "case not supported"
-            exit 1
-          fi
-
-          (current_dir=$(pwd) && cd $OUTPUT_PATH && zip -r "$current_dir/output.zip" .)
 
-      - name: Upload built artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: artifact-${{ matrix.repo }}
-          path: output.zip
-
-  unit-test-terraform-provider-googele:
-    name: unit-test-${{ matrix.repo }}
-    needs: build-downstreams
-    strategy:
-      fail-fast: false
-      matrix:
-        repo: ['terraform-provider-google', 'terraform-provider-google-beta']
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Download built artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: artifact-${{ matrix.repo }}
-          path: artifacts
-
-      - name: Unzip the artifacts and delete the zip
-        run: |
-          unzip artifacts/output.zip -d ./
-          rm artifacts/output.zip
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '^1.19'
-
-      - name: Cache Go modules and build cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/go/pkg/mod
-            ~/.cache/go-build
-          key: ${{ runner.os }}-test-${{ matrix.repo }}-${{hashFiles('go.sum','google-*/transport/**','google-*/tpgresource/**','google-*/acctest/**','google-*/envvar/**','google-*/sweeper/**','google-*/verify/**') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ matrix.repo }}-${{ hashFiles('go.sum') }}
-            ${{ runner.os }}-test-${{ matrix.repo }}-
-
-      - name: Build Provider
-        run: |
-          go build
-
-      - name: Run Unit Tests
-        run: |
-          make testnolint
-
-      - name: Lint Check
-        run: |
-          make lint
-
-      - name: Documentation Check
-        run: |
-          make docscheck
+  terraform-provider-google:
+    uses: ./.github/workflows/build-downstream.yml
+    with:
+      repo: 'terraform-provider-google'
+  terraform-provider-google-beta:
+    uses: ./.github/workflows/build-downstream.yml
+    with:
+      repo: 'terraform-provider-google-beta'
+  terraform-google-conversion:
+    uses: ./.github/workflows/build-downstream.yml
+    with:
+      repo: 'terraform-google-conversion'
+  docs-examples:
+    uses: ./.github/workflows/build-downstream.yml
+    with:
+      repo: 'docs-examples'
+
+  unit-test-terraform-provider-google:
+    needs: terraform-provider-google
+    uses: ./.github/workflows/unit-test-tpg.yml
+    with:
+      repo: 'terraform-provider-google'
+
+  unit-test-terraform-provider-googele-beta:
+    needs: terraform-provider-google-beta
+    uses: ./.github/workflows/unit-test-tpg.yml
+    with:
+      repo: 'terraform-provider-google-beta'
 
   unit-test-terraform-google-conversion:
-    needs: build-downstreams
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Download built artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: artifact-terraform-google-conversion
-          path: artifacts-tgc
-
-      - name: Download built artifacts
-        uses: actions/download-artifact@v2
-        with:
-          name: artifact-terraform-google-conversion
-          path: artifacts-tpgb
-
-      - name: Unzip the artifacts and delete the zip
-        run: |
-          set -x
-          unzip artifacts-tgc/output.zip -d ./tgc
-          unzip artifacts-tpgb/output.zip -d ./tpgb
-          rm artifacts-tgc/output.zip
-          rm artifacts-tpgb/output.zip
-
-      - name: Set up Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '^1.19'
-
-      - name: Cache Go modules and build cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-test-terraform-google-conversion-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-test-terraform-google-conversion-${{ hashFiles('**/go.sum') }}
-            ${{ runner.os }}-test-terraform-google-conversion-
-
-      - name: Build Terraform Google Conversion
-        run: |
-          go mod edit -replace=github.com/hashicorp/terraform-provider-google-beta=../tpgb
-          go mod tidy
-          make build
-
-      - name: Run Unit Tests
-        run: |
-          make test
+    needs: [terraform-google-conversion, terraform-provider-google-beta]
+    uses: ./.github/workflows/unit-test-tgc.yml