Skip to content

Commit

Permalink
fix: change 1.x to 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jackd248 committed Dec 2, 2024
1 parent e225df6 commit c7e081c
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 38 deletions.
56 changes: 28 additions & 28 deletions .gitlab-ci.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
# INCLUDES
#-----------------------------------------------------------------------------------------------------------------------
include:
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/.base.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/build-php-typo3.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/build-php-drupal.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/build-php-symfony.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/build-node-typo3.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/build-node-drupal.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/build-node-symfony.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-composer-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-editorconfig.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-php-cs-fixer.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-php-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-php-rector.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-php-stan.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-xml-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-yaml-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-typoscript-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/deploy/deploy-feature.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/deploy/deploy-feature-rollback.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/deploy/deploy-feature-stop.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/deploy/deploy-feature-stop-downstream.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/deploy/deploy-prod.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/deploy/deploy-prod-rollback.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/sync/sync-feature.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/test/test-feature-codeception.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/test/test-feature-lighthouse.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/test/test-prod-lighthouse.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/.base.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/build-php-typo3.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/build-php-drupal.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/build-php-symfony.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/build-node-typo3.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/build-node-drupal.yml'
# - 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/build-node-symfony.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-composer-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-editorconfig.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-php-cs-fixer.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-php-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-php-rector.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-php-stan.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-xml-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-yaml-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-typoscript-lint.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/deploy/deploy-feature.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/deploy/deploy-feature-rollback.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/deploy/deploy-feature-stop.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/deploy/deploy-feature-stop-downstream.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/deploy/deploy-prod.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/deploy/deploy-prod-rollback.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/sync/sync-feature.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/test/test-feature-codeception.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/test/test-feature-lighthouse.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/test/test-prod-lighthouse.yml'
# these are scheduled jobs - see readme how to setup
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/sync/sync-feature-scheduled.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-composer-security-scheduled.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/sync/sync-feature-scheduled.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-composer-security-scheduled.yml'

#-----------------------------------------------------------------------------------------------------------------------
# CONFIGURATION
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ Use `include` to reference template files:

```yaml
include:
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/.base.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/analyse/analyse-composer.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/.base.yml'
- 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/analyse/analyse-composer.yml'
- ...
```
Expand Down Expand Up @@ -172,5 +172,5 @@ This is useful if main branch does not contain the current pipeline setup and th

## Development

The development workflow provides for all minor changes to be checked into the "1.x" branch so that all associated projects automatically receive the latest version from this branch.
The development workflow provides for all minor changes to be checked into the "2.x" branch so that all associated projects automatically receive the latest version from this branch.
If there are breaking changes, a new branch "2.x" is created so that the associated projects can be updated manually.
2 changes: 1 addition & 1 deletion build/build-node-drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Configuration:
# Adjust the needed artifact paths
#
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/.build-node.yml'
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/.build-node.yml'

build:node:
extends: .build-node
Expand Down
2 changes: 1 addition & 1 deletion build/build-node-symfony.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Configuration:
# Adjust the needed artifact paths
#
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/.build-node.yml'
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/.build-node.yml'

build:node:
extends: .build-node
Expand Down
2 changes: 1 addition & 1 deletion build/build-node-typo3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Configuration:
# Adjust the needed artifact paths
#
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/.build-node.yml'
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/.build-node.yml'

build:node:
extends: .build-node
2 changes: 1 addition & 1 deletion build/build-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# @deprecation this file is kept for backwards compatibility and will be removed in the future.
# It's highly recommended to avoid including this file but instead include one of the more specific files like build-node-*.yaml.
#
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/.build-node.yml'
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/.build-node.yml'

build:node:
extends: .build-node
2 changes: 1 addition & 1 deletion build/build-php-drupal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Configuration:
# Adjust the needed artifact paths
#
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/.build-php.yml'
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/.build-php.yml'

build:php:
extends: .build-php
Expand Down
2 changes: 1 addition & 1 deletion build/build-php-symfony.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Configuration:
# Adjust the needed artifact paths
#
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/.build-php.yml'
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/.build-php.yml'

build:php:
extends: .build-php
2 changes: 1 addition & 1 deletion build/build-php-typo3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Configuration:
# Adjust the needed artifact paths
#
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/1.x/build/.build-php.yml'
include: 'https://raw.githubusercontent.com/xima-media/xima-gitlab-ci-templates/2.x/build/.build-php.yml'

build:php:
extends: .build-php
Expand Down

0 comments on commit c7e081c

Please sign in to comment.