Skip to content

Commit

Permalink
feat(drupal): Updates to support 10.1.x
Browse files Browse the repository at this point in the history
  • Loading branch information
sylus committed Dec 12, 2023
1 parent ea0ad60 commit c848f85
Show file tree
Hide file tree
Showing 7 changed files with 1,197 additions and 950 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: build
on:
push:
branches:
- 10.0.x
- 10.1.x

# Environment variables available to all jobs and steps in this workflow
env:
Expand Down Expand Up @@ -31,7 +31,7 @@ jobs:
run: |
export DB_TYPE=${{ matrix.db.type }}
export DB_PORT=${{ matrix.db.port }}
git clone --branch 10.0.x https://github.com/drupalwxt/docker-scaffold.git docker
git clone --branch 10.1.x https://github.com/drupalwxt/docker-scaffold.git docker
make build
docker compose -f docker-compose.ci.yml up -d
docker ps -a
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
run: |
export DB_TYPE=mysql
export DB_PORT=3306
git clone --branch 10.0.x https://github.com/drupalwxt/docker-scaffold.git docker
git clone --branch 10.1.x https://github.com/drupalwxt/docker-scaffold.git docker
make build
docker compose -f docker-compose.ci.yml up -d
docker ps -a
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: |
export DB_TYPE=mysql
export DB_PORT=3306
git clone --branch 10.0.x https://github.com/drupalwxt/docker-scaffold.git docker
git clone --branch 10.1.x https://github.com/drupalwxt/docker-scaffold.git docker
make build
docker compose -f docker-compose.ci.yml up -d
docker ps -a
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ PLATFORM := $(shell uname -s)
$(eval GIT_USERNAME := $(if $(GIT_USERNAME),$(GIT_USERNAME),gitlab-ci-token))
$(eval GIT_PASSWORD := $(if $(GIT_PASSWORD),$(GIT_PASSWORD),$(CI_JOB_TOKEN)))
DOCKER_REPO := https://github.com/drupalwxt/docker-scaffold.git
SCAFFOLD_VERSION := '10.0.x'
SCAFFOLD_VERSION := '10.1.x'
GET_DOCKER := $(shell [ -d docker ] || git clone --branch $(SCAFFOLD_VERSION) $(DOCKER_REPO) docker)
include docker/Makefile
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ This composer-project was initially created by our Composer Project Template for
The following is the command that was used for initial generation:

```sh
composer create-project drupalwxt/site-wxt:5.0.x-dev site-wxt
composer create-project drupalwxt/site-wxt:5.1.x-dev site-wxt
```

> **Note**: Normally you might want to use a stable tag such as `drupalwxt/site-wxt:5.0.x-dev`.
> **Note**: Normally you might want to use a stable tag such as `drupalwxt/site-wxt:5.1.x-dev`.
## Maintenance

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
"prefer-stable": true,
"require": {
"cweagans/composer-patches": "^1.6.0",
"drupal/core-composer-scaffold": "^10.0",
"drupalwxt/wxt": "5.0.1"
"drupal/core-composer-scaffold": "^10.1",
"drupalwxt/wxt": "5.1.x-dev"
},
"require-dev": {
"drupal/core-dev": "^10.0",
"drupal/core-dev": "^10.1",
"drupal/drupal-extension": "5.0.0-alpha1",
"drush/drush": ">=12.1.0",
"oomphinc/composer-installers-extender": "^1.1 || ^2",
Expand Down
Loading

0 comments on commit c848f85

Please sign in to comment.