Skip to content

Commit

Permalink
feat(rebranding): migrate tde to oym
Browse files Browse the repository at this point in the history
  • Loading branch information
jordikroon committed Jan 18, 2024
1 parent 08dd3d6 commit f42e581
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 18 deletions.
32 changes: 16 additions & 16 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
---
include:
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/config/variables.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/config/variables.yml"

- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-build/assets.yml"
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-build/vendors.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-build/assets.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-build/vendors.yml"

- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/phpcs.yml"
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/eslint.yml"
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/prettier.yml"
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-test/stylelint.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/phpcs.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/eslint.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/prettier.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-test/stylelint.yml"

- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-deploy/deployer.yml"
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-post-deploy/supervisord.yml"
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-post-deploy/release.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-deploy/deployer.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-post-deploy/supervisord.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-post-deploy/release.yml"

- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-static-cache/static-html.yml"
- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-static-cache/static-json.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-static-cache/static-html.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-static-cache/static-json.yml"

- "https://raw.githubusercontent.com/tdeNL/tde-gitlab-deploy-templates/master/stage-proxy-cache/varnish.yml"
- "https://raw.githubusercontent.com/onyourmarks-agency/oym-gitlab-deploy-templates/master/stage-proxy-cache/varnish.yml"

variables:
SSH_STAGING: "tde@server.tdebv.nl"
SSH_PRODUCTION: "tde@server.tdebv.nl"
SSH_STAGING: "SERVER.instance.onyourmarks.tech"
SSH_PRODUCTION: "SERVER.instance.onyourmarks.tech"
SERVER_FOLDER_STAGING: "project.tld"
SERVER_FOLDER_PRODUCTION: "project.tdebv.nl"
SERVER_FOLDER_PRODUCTION: "PROJECT.staging.SERVER.instance.onyourmarks.tech"
3 changes: 2 additions & 1 deletion stage-deploy/deployer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.deploy_global_template: &deploy_global
stage: deploy
when: manual
image: $CI_REGISTRY/tdenl/tde-public/tde-docker-deploy-image:$PHP_VERSION
image: $CI_REGISTRY/onyourmarks/public/oym-docker-deploy-image:$PHP_VERSION
allow_failure: false
cache:
- key: 'asset_build-$CI_COMMIT_REF_NAME-build'
Expand All @@ -29,6 +29,7 @@
action: start
before_script:
- !reference [.ssh_host_connection, before_script]
- 'wget https://getcomposer.org/download/2.6.5/composer.phar'
script:
- '[[ -f $PRODUCTION_ENV_FILE ]] && sed -i "s/\$VAR_COMMIT_ID/$CI_COMMIT_SHORT_SHA/" $PRODUCTION_ENV_FILE'
- '[[ -f $STAGING_ENV_FILE ]] && sed -i "s/\$VAR_COMMIT_ID/$CI_COMMIT_SHORT_SHA/" $STAGING_ENV_FILE'
Expand Down
2 changes: 1 addition & 1 deletion stage-post-deploy/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
release:production:
stage: post-deploy
image: registry.gitlab.com/gitlab-org/release-cli:latest
allow_failure: false
allow_failure: true
variables:
GIT_STRATEGY: none
needs:
Expand Down

0 comments on commit f42e581

Please sign in to comment.