chore(build): remove duplication in build steps (#9832)

mattgogerly · web-flow · commit c8fc2e60ffad · 2022-03-23T21:09:02.000Z
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,49 +24,35 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ env.NODE_VERSION  }}
+
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - uses: actions/cache@v1
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - name: Install Dependencies
-        run: yarn --frozen-lockfile
-      - name: Eslint Plugin Build
-        run: |
-          cd packages/eslint-plugin
-          yarn tsc
-          yarn test
-      - name: Assert - no lint violations
-        run: yarn lint
-      - name: Assert - code is formatted
-        run: yarn prettier:check
-      - name: Build Modules
-        run: yarn modules
-      - name: Unit Tests
-        run: yarn test --single-run
-      - name: Functional Tests
-        run: yarn functional
-      - name: Yarn Build
-        run: yarn build
 
       - uses: actions/setup-java@v2
         with:
           java-version: 11
           distribution: 'zulu'
           cache: 'gradle'
+
       - name: Prepare build variables
         id: build_variables
         run: |
           echo ::set-output name=REPO::${GITHUB_REPOSITORY##*/}
           echo ::set-output name=VERSION::"$(git describe --tags --abbrev=0 --match="v[0-9]*" | cut -c2-)-dev-${GITHUB_REF_NAME}-$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')"
+
       - name: Build
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: ./gradlew build --stacktrace
+
       - name: Login to GAR
         # Only run this on repositories in the 'spinnaker' org, not on forks.
         if: startsWith(github.repository, 'spinnaker/')
@@ -76,6 +62,7 @@ jobs:
           registry: us-docker.pkg.dev
           username: _json_key
           password: ${{ secrets.GAR_JSON_KEY }}
+
       - name: Build and publish slim container image
         # Only run this on repositories in the 'spinnaker' org, not on forks.
         if: startsWith(github.repository, 'spinnaker/')
@@ -89,6 +76,7 @@ jobs:
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ github.ref_name }}-latest-unvalidated-slim"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-unvalidated-slim"
+
       - name: Build and publish ubuntu container image
         # Only run this on repositories in the 'spinnaker' org, not on forks.
         if: startsWith(github.repository, 'spinnaker/')
diff --git a/.github/workflows/package-bump-pr.yml b/.github/workflows/package-bump-pr.yml
@@ -79,7 +79,7 @@ jobs:
 
             ---
 
-            This Pr bumps each package to the next semver version (patch/minor/major) based on the commit messages of unpublished changes using [Conventional Commits](https://conventionalcommits.org).
+            This PR bumps each package to the next semver version (patch/minor/major) based on the commit messages of unpublished changes using [Conventional Commits](https://conventionalcommits.org).
 
               - fix: patch release
               - feat: minor release
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -17,49 +17,35 @@ jobs:
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ env.NODE_VERSION  }}
+
       - name: Get yarn cache
         id: yarn-cache
         run: echo "::set-output name=dir::$(yarn cache dir)"
+
       - uses: actions/cache@v1
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      - name: Install Dependencies
-        run: yarn --frozen-lockfile
-      - name: Eslint Plugin Build
-        run: |
-          cd packages/eslint-plugin
-          yarn tsc
-          yarn test
-      - name: Assert - no lint violations
-        run: yarn lint
-      - name: Assert - code is formatted
-        run: yarn prettier:check
-      - name: Build Modules
-        run: yarn modules
-      - name: Unit Tests
-        run: yarn test --single-run
-      - name: Functional Tests
-        run: yarn functional
-      - name: Yarn Build
-        run: yarn build
 
       - uses: actions/setup-java@v2
         with:
           java-version: 11
           distribution: 'zulu'
           cache: 'gradle'
+
       - name: Prepare build variables
         id: build_variables
         run: |
           echo ::set-output name=REPO::${GITHUB_REPOSITORY##*/}
           echo ::set-output name=VERSION::"$(git describe --tags --abbrev=0 --match="v[0-9]*" | cut -c2-)-dev-pr-$(git rev-parse --short HEAD)-$(date --utc +'%Y%m%d%H%M')"
+
       - name: Build
         env:
           ORG_GRADLE_PROJECT_version: ${{ steps.build_variables.outputs.VERSION }}
         run: ./gradlew build
+
       - name: Build slim container image
         uses: docker/build-push-action@v2
         with:
@@ -70,6 +56,7 @@ jobs:
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:latest-slim"
             "${{ env.CONTAINER_REGISTRY }}/${{ steps.build_variables.outputs.REPO }}:${{ steps.build_variables.outputs.VERSION }}-slim"
+
       - name: Build ubuntu container image
         uses: docker/build-push-action@v2
         with:
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,12 @@
-plugins {
-  id "io.spinnaker.artifactregistry-publish" version "$spinnakerGradleVersion"
-  id "nebula.node" version "1.3.1"
-}
-
 import java.nio.file.Paths
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import org.redline_rpm.header.Flags
 
+plugins {
+  id "io.spinnaker.artifactregistry-publish" version "$spinnakerGradleVersion"
+  id "nebula.node" version "1.3.1"
+}
 
 group = "com.netflix.spinnaker.deck"
 apply plugin: "nebula.ospackage"
@@ -27,32 +26,48 @@ node {
 
 task modules(type: YarnTask) {
   dependsOn "yarn"
+
   yarnCommand = ["modules"]
 }
 
-task webpack(type: YarnTask) {
-  dependsOn "yarn"
+task eslintPluginCompile(type: YarnTask) {
   dependsOn "modules"
-  dependsOn "test"
 
-  yarnCommand = ["build"]
-  environment = [
-    "NODE_ENV": "production",
-    "GATE_HOST": "spinnaker-api-prestaging.prod.netflix.net",
-    "NODE_OPTIONS": "--max_old_space_size=8192",
-  ]
+  workingDir = file(Paths.get("packages", "eslint-plugin"))
+  yarnCommand = ["tsc"]
 }
 
-task copyFavicon(type: Copy) {
-  dependsOn "webpack"
+task eslintPluginTest(type: YarnTask) {
+  dependsOn "eslintPluginCompile"
 
-  from "packages/app/icons/prod-favicon.ico"
-  into "build/webpack"
-  rename "prod-favicon.ico", "favicon.ico"
+  workingDir = file(Paths.get("packages", "eslint-plugin"))
+  yarnCommand = ["test"]
+}
+
+project.tasks.register('eslintPlugin') {
+  dependsOn 'eslintPluginCompile'
+  dependsOn 'eslintPluginTest'
+}
+
+task lint(type: YarnTask) {
+  dependsOn "eslintPlugin"
+
+  yarnCommand = ["lint"]
+}
+
+task prettier(type: YarnTask) {
+  dependsOn "eslintPlugin"
+  dependsOn "lint"
+
+  yarnCommand = ["prettier:check"]
+}
+
+project.tasks.register('runLinters') {
+  dependsOn "lint"
+  dependsOn "prettier"
 }
 
 task karma(type: YarnTask) {
-  dependsOn "yarn"
   dependsOn "modules"
 
   yarnCommand = ["test"]
@@ -64,10 +79,42 @@ task karma(type: YarnTask) {
 }
 
 task functionalTests(type: YarnTask) {
-  dependsOn "yarn"
   dependsOn "modules"
+  dependsOn "karma"
 
   yarnCommand = ["functional"]
+
+  if (project.hasProperty('skipTests')) {
+    functionalTests.enabled = false
+  }
+}
+
+project.tasks.register('test') {
+  dependsOn 'karma'
+  dependsOn 'functionalTests'
+}
+
+task webpack(type: YarnTask) {
+  dependsOn "yarn"
+  dependsOn "modules"
+  dependsOn "runLinters"
+  dependsOn "test"
+
+  yarnCommand = ["build"]
+  environment = [
+    "NODE_ENV": "production",
+    "GATE_HOST": "spinnaker-api-prestaging.prod.netflix.net",
+    "NODE_OPTIONS": "--max_old_space_size=8192",
+  ]
+}
+webpack.outputs.dir file('build/webpack')
+
+task copyFavicon(type: Copy) {
+  dependsOn "webpack"
+
+  from "packages/app/icons/prod-favicon.ico"
+  into "build/webpack"
+  rename "prod-favicon.ico", "favicon.ico"
 }
 
 task generateVersionFile {
@@ -83,13 +130,8 @@ task generateVersionFile {
     file("version.json").write(buildJson)
   }
 }
-
-webpack.outputs.dir file('build/webpack')
-
 yarn.dependsOn 'generateVersionFile'
-project.tasks.register('test') {
-  dependsOn 'karma'
-}
+
 buildDeb.dependsOn 'copyFavicon'
 buildRpm.dependsOn 'webpack'
 build.dependsOn 'buildDeb'
diff --git a/version.json b/version.json
@@ -1,4 +1,4 @@
 {
     "version": "n/a",
-    "created": 1647951273397
+    "created": 1648032845852
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "n/a",`
`3`		`- "created": 1647951273397`
	`3`	`+ "created": 1648032845852`
`4`	`4`	`}`