feat(wxt): Switch to 5.4.x

drupalwxt · Dec 20, 2024 · 253a338 · 253a338
1 parent ccb8631
commit 253a338
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
 
     - name: Setup dependencies
       run: |
-        git clone --branch 10.3.x https://github.com/drupalwxt/site-wxt.git
+        git clone --branch 10.4.x https://github.com/drupalwxt/site-wxt.git
         cd site-wxt
         rm composer.lock
 
@@ -38,7 +38,7 @@ jobs:
         export DB_TYPE=${{ matrix.db.type }}
         export DB_PORT=${{ matrix.db.port }}
         cd site-wxt
-        git clone --branch 10.3.x https://github.com/drupalwxt/docker-scaffold.git docker
+        git clone --branch 10.4.x https://github.com/drupalwxt/docker-scaffold.git docker
         make build
         docker compose -f docker-compose.ci.yml up -d
         docker ps -a

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -13,7 +13,7 @@ jobs:
 
     - name: Setup dependencies
       run: |
-        git clone --branch 10.3.x https://github.com/drupalwxt/site-wxt.git
+        git clone --branch 10.4.x https://github.com/drupalwxt/site-wxt.git
         cd site-wxt
         rm composer.lock
 
@@ -26,7 +26,7 @@ jobs:
         export DB_TYPE=mysql
         export DB_PORT=3306
         cd site-wxt
-        git clone --branch 10.3.x https://github.com/drupalwxt/docker-scaffold.git docker
+        git clone --branch 10.4.x https://github.com/drupalwxt/docker-scaffold.git docker
         make build
         docker compose -f docker-compose.ci.yml up -d
         docker ps -a

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -21,7 +21,7 @@ jobs:
       run: |
         git config --global user.email "[email protected]"
         git config --global user.name "drupalwxt-svc"
-        git clone --branch 10.3.x https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/site-wxt.git
+        git clone --branch 10.4.x https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/site-wxt.git
         cd site-wxt
         rm composer.lock
 
@@ -34,7 +34,7 @@ jobs:
         export DB_TYPE=mysql
         export DB_PORT=3306
         cd site-wxt
-        git clone --branch 10.3.x https://github.com/drupalwxt/docker-scaffold.git docker
+        git clone --branch 10.4.x https://github.com/drupalwxt/docker-scaffold.git docker
         make build
         docker compose -f docker-compose.ci.yml up -d
         docker ps -a
@@ -82,8 +82,8 @@ jobs:
 
     - name: Checkout repos to update tags
       run: |
-        git clone --branch 10.3.x https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/site-wxt.git
-        git clone --branch 10.3.x https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/wxt-project.git
+        git clone --branch 10.4.x https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/site-wxt.git
+        git clone --branch 10.4.x https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/wxt-project.git
         git clone --branch main   https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/helm-drupal.git
         git clone --branch master https://drupalwxt-svc:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/drupalwxt/terraform-kubernetes-drupalwxt.git
 
@@ -152,7 +152,7 @@ jobs:
         git add .
         git commit -m "feat(composer): Update version in the composer.json file ${{ env.GITHUB_REFERENCE }}" || true
         git tag ${{ env.GITHUB_REFERENCE }}
-        git push origin 10.3.x
+        git push origin 10.4.x
         git push origin ${{ env.GITHUB_REFERENCE }}
 
     - name: Update tags for site-wxt
@@ -179,15 +179,15 @@ jobs:
       run: |
         git add .
         git commit -m "feat(composer): Update version in the composer.json file" || true
-        git push origin 10.3.x
+        git push origin 10.4.x
 
     - name: Push to wxt-project the latest tags
       run: |
         cd wxt-project
         git add .
         git commit -m "Update to latest version of WxT ${{ env.GITHUB_REFERENCE }}" || true
         git tag ${{ env.GITHUB_REFERENCE }}
-        git push origin 10.3.x
+        git push origin 10.4.x
         git push origin ${{ env.GITHUB_REFERENCE }}
 
     - name: Push to helm-drupal the latest tags

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -34,5 +34,5 @@ variables:
 
 composer:
   variables:
-    DRUPAL_CORE: 10.3.6
+    DRUPAL_CORE: 10.4.0
 
diff --git a/composer.json b/composer.json
@@ -23,8 +23,8 @@
         "drupal/ckeditor_codemirror": "^3.0.0-beta4",
         "drupal/ckeditor_details": "^2.1.0-alpha1",
         "drupal/config_rewrite": "^1.5",
-        "drupal/core-composer-scaffold": "^10.3",
-        "drupal/core-recommended": "^10.3",
+        "drupal/core-composer-scaffold": "10.4.*",
+        "drupal/core-recommended": "10.4.*",
         "drupal/core_context": "1.1",
         "drupal/crop": "^2.0.0-rc1",
         "drupal/ctools": "^3.9",

diff --git a/tarball.sh b/tarball.sh
@@ -12,7 +12,7 @@ if [[ ! $YAML_CLI ]]; then
 fi
 
 rm -rf $ARCHIVE
-composer create-project --stability beta --no-install drupal/legacy-project:10.3.6 $ARCHIVE
+composer create-project --stability beta --no-install drupal/legacy-project:10.4.0 $ARCHIVE
 composer dump-autoload
 composer configure-tarball $ARCHIVE
 
@@ -33,7 +33,7 @@ for plugin in drupal/core-composer-scaffold composer/installers cweagans/install
   composer config --no-plugins allow-plugins.$plugin true
 done
 composer remove --no-update composer/installers
-composer require --no-update "ext-dom:*" cweagans/composer-patches oomphinc/composer-installers-extender 'drupal/core:10.3.6'
+composer require --no-update "ext-dom:*" cweagans/composer-patches oomphinc/composer-installers-extender 'drupal/core:10.4.0'
 composer update --ignore-platform-reqs
 
 # Create the profile destination directory.