1

.github/workflows/master.yml

@@ -2,7 +2,7 @@ name: Build and Push to ACR
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "master" ]
 
 env:
   REGION_ID: cn-shenzhen
@@ -25,7 +25,7 @@ permissions:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: dev
+    environment: prod
 
     steps:
       - name: Checkout
@@ -53,7 +53,7 @@ jobs:
 
       - name: Kustomize Set Image
         run: |-
-          cd kustomization/overlays/dev
+          cd kustomization/overlays/prod
           curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash /dev/stdin 3.8.6
           ./kustomize edit set image REGISTRY/NAMESPACE/IMAGE:TAG=$REGISTRY/$NAMESPACE/$IMAGE:$TAG
 
@@ -133,5 +133,9 @@ jobs:
 >>>>>>> 9ec03fb (Update master.yml)
 =======
           git commit -am "generated Image update"
+<<<<<<< HEAD
           git push origin develop
 >>>>>>> f6ab32a (Update master.yml)
+=======
+          git push origin master
+>>>>>>> 99771eb (1)