chore(actions): change manifests path (#11)

ydataai · Sep 27, 2021 · 4f72111 · 4f72111
1 parent ae1cc45
commit 4f72111
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 30 deletions.
diff --git a/.github/workflows/merge_master.yaml → .github/workflows/merge-master.yaml b/.github/workflows/merge_master.yaml → .github/workflows/merge-master.yaml
@@ -1,8 +1,11 @@
-name: master
+name: Merge master
+
 
 on:
   push:
-    branches: [ master ]
+    branches:
+    - master
+
 
 jobs:
   prepare:
@@ -68,7 +71,9 @@ jobs:
     name: Dev Release
     runs-on: ubuntu-20.04
 
-    needs: [ prepare, build ]
+    needs:
+    - prepare
+    - build
 
     steps:
     - name: Create Pre Release
@@ -78,7 +83,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
         VERSION: ${{ needs.prepare.outputs.release }}
       with:
-        tag_name: build/${{ env.VERSION }}/${{ env.BUILD }}
+        tag_name: ${{ env.VERSION }}.${{ env.BUILD }}
         release_name: ${{ env.VERSION }}.${{ env.BUILD }}
         body: ${{ github.event.head_commit.message }}
         prerelease: true
@@ -90,7 +95,9 @@ jobs:
     name: Draft Release
     runs-on: ubuntu-20.04
 
-    needs: [ prepare, build ]
+    needs:
+    - prepare
+    - build
 
     steps:
     - name: Delete Previous drafts

diff --git a/.github/workflows/prereleased.yaml b/.github/workflows/prereleased.yaml
@@ -1,21 +1,17 @@
 name: Prereleased
 
+
 on:
   release:
-    types: [ prereleased ]
-
-env:
-  COMPONENT: aws/quota-provider
-  CONTAINER: ${{ secrets.DEPLOYMENT_CONTAINER }}
-  DEPLOYMENT_NAME: ${{ secrets.DEPLOYMENT_NAME }}
+    types:
+    - prereleased
 
-  GCLOUD_SDK_VERSION: '290.0.1'
 
-  CLUSTER: ${{ secrets.GOOGLE_CLUSTER_DEV }}
-  DOCKER_CONTAINER_REGISTRY: ${{ secrets.PRIVATE_CONTAINER_REGISTRY }}
+env:
+  COMPONENT: aws-quota-provider
+  COMPONENT_PATH: distributions/aws/quota-provider/
   DOCKER_IMAGE_URL: ${{ secrets.PRIVATE_CONTAINER_REGISTRY }}/${{ github.repository_owner }}/aws-quota-provider
-  PROJECT: ${{ secrets.GOOGLE_PROJECT_ID_DEV }}
-  ZONE: ${{ secrets.GOOGLE_CLUSTER_DEV_ZONE }}
+
 
 jobs:
   build:
@@ -28,7 +24,7 @@ jobs:
     steps:
     - name: Version
       id: version
-      run: echo ::set-output name=value::`echo ${{ github.ref }} | sed -n -E 's/refs\/tags\/build\/([0-9]+.[0-9]+.[0-9]+)\/([[:alnum:]])/\1.\2/p'`
+      run: echo ::set-output name=value::${GITHUB_REF#refs/*/}
 
     - uses: actions/checkout@v2
 
@@ -51,11 +47,13 @@ jobs:
         secrets: |
           GIT_AUTH_TOKEN=${{ secrets.GHCR_TOKEN }}
 
+
   update-manifests:
     name: Update Manifests
     runs-on: ubuntu-20.04
 
-    needs: build
+    needs:
+    - build
 
     steps:
     - name: Checkout Manifests repo
@@ -72,7 +70,7 @@ jobs:
       env:
         VERSION: ${{ needs.build.outputs.version }}
       run: |
-        cd ydata/${COMPONENT}
+        cd ${COMPONENT_PATH}
         kustomize edit set image ${{ secrets.KUSTOMIZE_PROVIDER_CONTAINER_IMAGE }}=${DOCKER_IMAGE_URL}:${VERSION}
 
     - name: Commit and push image update into manifests repo

diff --git a/.github/workflows/pull_request.yaml → .github/workflows/pull-request.yaml b/.github/workflows/pull_request.yaml → .github/workflows/pull-request.yaml
@@ -1,8 +1,11 @@
-name: pull request
+name: Pull request
+
 
 on:
   pull_request:
-    branches: [ master ]
+    branches:
+    - master
+
 
 jobs:
   validate:

diff --git a/.github/workflows/released.yaml b/.github/workflows/released.yaml
@@ -1,14 +1,18 @@
-name: Release
+name: Released
+
 
 on:
   release:
-    types: [ released ]
+    types:
+    - released
+
 
 env:
-  COMPONENT: aws/quota-provider
-  DOCKER_CONTAINER_REGISTRY: ${{ secrets.PRIVATE_CONTAINER_REGISTRY }}
+  COMPONENT: aws-quota-provider
+  COMPONENT_PATH: distributions/aws/quota-provider/
   DOCKER_IMAGE_URL: ${{ secrets.PRIVATE_CONTAINER_REGISTRY }}/${{ github.repository_owner }}/aws-quota-provider
 
+
 jobs:
   prepare:
     name: Extract Version and Build number
@@ -21,7 +25,7 @@ jobs:
     steps:
     - name: Version
       id: version
-      run: echo ::set-output name=value::`echo ${{ github.ref }} | sed -n -E 's/refs\/tags\/([0-9]+.[0-9]+.[0-9]+)/\1/p'`
+      run: echo ::set-output name=value::${GITHUB_REF#refs/*/}
 
     - uses: actions/checkout@v2
 
@@ -34,13 +38,14 @@ jobs:
     name: Docker Tag and Push
     runs-on: ubuntu-20.04
 
-    needs: prepare
+    needs:
+    - prepare
 
     steps:
     - name: Login to GitHub docker
       uses: docker/login-action@v1
       with:
-        registry: ${{ env.DOCKER_CONTAINER_REGISTRY }}
+        registry: ${{ secrets.PRIVATE_CONTAINER_REGISTRY }}
         username: ${{ github.actor }}
         password: ${{ secrets.GHCR_TOKEN }}
 
@@ -58,7 +63,9 @@ jobs:
     name: Update Manifests
     runs-on: ubuntu-20.04
 
-    needs: [ prepare, docker ]
+    needs:
+    - prepare
+    - docker
 
     steps:
     - name: Checkout Manifests repo
@@ -75,7 +82,7 @@ jobs:
       env:
         VERSION: ${{ needs.prepare.outputs.version }}
       run: |
-        cd ydata/${COMPONENT}
+        cd ${COMPONENT_PATH}
         kustomize edit set image ${{ secrets.KUSTOMIZE_PROVIDER_CONTAINER_IMAGE }}=${DOCKER_IMAGE_URL}:${VERSION}
 
     - name: Commit and push image update into manifests repo