Merge branch 'develop' into 'master'

Develop See merge request papers/airgap/airgap-wallet!767
airgap-it · Aug 21, 2024 · 8e17b96 · 8e17b96
2 parents 196e55f + 7db2ae3
commit 8e17b96
Show file tree

Hide file tree

Showing 3 changed files with 448 additions and 471 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -192,18 +192,13 @@ publish-web-prod:
   when: manual
   needs:
     - build-web
-  only:
-    - master
-    - main
 
 deploy-web-dev:
   stage: deploy
   extends: .run_dev
   needs:
     - publish-web-dev
   when: manual
-  only:
-    - develop
   script:
     - find k8s -type f -name \*.yaml -exec sed -i "s|__NAMESPACE__|"$NAMESPACE"|g" {} +
     - find k8s -type f -name \*.yaml -exec sed -i "s|__CI_PROJECT_NAME__|"$CI_PROJECT_NAME"|g" {} +
@@ -225,6 +220,3 @@ deploy-web-prod:
     - kubectl apply -f k8s/airgap-wallet/common/namespace.yaml
     - kubectl apply -f k8s/airgap-wallet/production/ --recursive
     - kubectl apply -f k8s/airgap-wallet/common/ --recursive
-  only:
-    - master
-    - main