Revert "[Playground][BEAM-12941][Bugfix] Fix workflows for playground…

… applications (#83)" (#88) This reverts commit b73f5f7.
akvelon · Nov 16, 2021 · d449275 · d449275
1 parent b73f5f7
commit d449275
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/.github/workflows/build_playground_backend.yml b/.github/workflows/build_playground_backend.yml
@@ -17,8 +17,10 @@ name: Build And Deploy Playground Backend Application
 
 on:
   push:
+    branches: ['master', 'release-*']
     tags: 'v*'
   pull_request:
+    branches: ['master', 'release-*']
     tags: 'v*'
     paths: ['playground/backend/**']
   workflow_dispatch:
@@ -43,14 +45,12 @@ jobs:
       - name: Prepare Go lint env
         run: "sudo ./playground/backend/env_setup.sh"
       - name: Run Lint
-#        run: "golangci-lint run internal/..."
-        run: "golangci-lint run cmd/server/..."
+        run: "golangci-lint run internal/..."
         working-directory: playground/backend/
-      - name: Remove default github maven configuration
-        # This step is a workaround to avoid a decryption issue
-        run: rm ~/.m2/settings.xml
+        continue-on-error: true
       - name: Run Tests
         run: ./gradlew playground:backend:test
+        continue-on-error: true
       - name: install npm
         uses: actions/setup-node@v2
         with:
@@ -62,16 +62,12 @@ jobs:
         working-directory: playground/backend/containers/java
       - name: Setup GCP account
         run: echo ${{ secrets.GCP_ACCESS_KEY }} | base64 -d > /tmp/gcp_access.json
-        if: startsWith(github.ref, 'ref/tags/') 
       - name: Login to Docker Registry
         run: cat /tmp/gcp_access.json | docker login -u _json_key --password-stdin https://${{ secrets.REGISTRY_NAME }}
-        if: startsWith(github.ref, 'ref/tags/')
       - name: Preapre Build
         run: ./gradlew playground:backend:containers:java:dockerPush -Pdocker-repository-root='${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository' -Pbase-image='apache/beam_java8_sdk:${{ env.BEAM_VERSION }}'
-        if: startsWith(github.ref, 'ref/tags/')
       - name: Deploy Backend Application
         env: 
           GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp_access.json
         run: terraform init && terraform apply -auto-approve -var="project_id=${{ secrets.PROJECT_ID }}" -var="docker_registry_address=${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository"
         working-directory: playground/terraform/applications/backend
-        if: startsWith(github.ref, 'ref/tags/')
diff --git a/.github/workflows/build_playground_frontend.yml b/.github/workflows/build_playground_frontend.yml
@@ -17,10 +17,12 @@ name: Build And Deploy Playground Frontend Application
 
 on:
   push:
+    branches: ['master', 'release-*']
     tags: 'v*'
   pull_request:
+    branches: ['master', 'release-*']
     tags: 'v*'
-    paths: ['playground/frontend/**']
+    paths: ['playground/backend/**']
   workflow_dispatch:
 
 jobs:
@@ -41,10 +43,18 @@ jobs:
         uses: subosito/flutter-action@v1
         with:
             channel: 'stable'
+      - name: Prepare Flutter lint
+        run: "flutter pub add flutter_lints --dev"
+        working-directory: playground/frontend/        
+        continue-on-error: true
       - name: Run Lint
-        run: ./gradlew playground:frontend:analyze
+        run: "flutter analyze"
+        working-directory: playground/frontend/
+        continue-on-error: true
       - name: Run Tests
-        run: ./gradlew playground:frontend:test
+        run: flutter test
+        working-directory: playground/frontend/
+        continue-on-error: true
       - name: install npm
         uses: actions/setup-node@v2
         with:
@@ -56,16 +66,12 @@ jobs:
         working-directory: playground/frontend
       - name: Setup GCP account
         run: echo ${{ secrets.GCP_ACCESS_KEY }} | base64 -d > /tmp/gcp_access.json
-        if: startsWith(github.ref, 'ref/tags/')
       - name: Login to Docker Registry
         run: cat /tmp/gcp_access.json | docker login -u _json_key --password-stdin https://${{ secrets.REGISTRY_NAME }}
-        if: startsWith(github.ref, 'ref/tags/')
       - name: Preapre Build
         run: ./gradlew --debug playground:frontend:dockerPush -Pdocker-repository-root='${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository'
-        if: startsWith(github.ref, 'ref/tags/')
       - name: Deploy Backend Application
         env:
           GOOGLE_APPLICATION_CREDENTIALS: /tmp/gcp_access.json
         run: terraform init && terraform apply -auto-approve -var="project_id=${{ secrets.PROJECT_ID }}" -var="docker_registry_address=${{ secrets.REGISTRY_NAME}}/${{ secrets.PROJECT_ID }}/playground-repository"
         working-directory: playground/terraform/applications/backend
-        if: startsWith(github.ref, 'ref/tags/')
diff --git a/playground/backend/containers/java/Dockerfile b/playground/backend/containers/java/Dockerfile
@@ -15,7 +15,7 @@
 #  See the License for the specific language governing permissions and
 # limitations under the License.
 ###############################################################################
-ARG BASE_IMAGE=apache/beam_java8_sdk:latest
+ARG BASE_IMAGE
 FROM golang:1.17-buster AS build
 
 # Setup Go Environment