From 827522643e9f8a5ea9be05b4847dc637f0f43a13 Mon Sep 17 00:00:00 2001 From: Yassine Doghri Date: Mon, 10 Jun 2024 16:34:13 +0000 Subject: [PATCH] build: release next major version as prerelease - edit .releaserc + gitlab-ci to add next branch - add plugins folder to bundle BREAKING CHANGE: next major release including plugins architecture --- .gitlab-ci.yml | 4 ++++ .releaserc.json | 4 ++++ .rsync-filter | 1 + docker/production/.gitlab-ci.yml | 3 ++- docker/production/castopod/Dockerfile | 2 +- scripts/bundle.sh | 2 +- 6 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 51e7330a..e00055b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,6 +53,7 @@ lint-commit-msg: - main - beta - alpha + - next lint-php: stage: quality @@ -120,6 +121,7 @@ bundle: - main - beta - alpha + - next release: stage: release @@ -148,6 +150,7 @@ release: - main - beta - alpha + - next website: stage: deploy @@ -176,5 +179,6 @@ docker: - main - beta - alpha + - next variables: - $CI_PROJECT_NAMESPACE == "adaures" diff --git a/.releaserc.json b/.releaserc.json index af98b785..d6eb2f66 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -8,6 +8,10 @@ { "name": "beta", "prerelease": true + }, + { + "name": "next", + "prerelease": true } ], "plugins": [ diff --git a/.rsync-filter b/.rsync-filter index 576403e0..877e5cb9 100644 --- a/.rsync-filter +++ b/.rsync-filter @@ -4,6 +4,7 @@ - app/Resources/** + app/*** + modules/*** ++ plugins/*** + public/*** + themes/*** + vendor/*** diff --git a/docker/production/.gitlab-ci.yml b/docker/production/.gitlab-ci.yml index 95e2a633..634ceff1 100644 --- a/docker/production/.gitlab-ci.yml +++ b/docker/production/.gitlab-ci.yml @@ -56,7 +56,7 @@ docker-build-main-release: refs: - main -docker-build-alpha-beta-release: +docker-build-prerelease: stage: build image: name: docker.io/docker:23.0.3-dind @@ -86,3 +86,4 @@ docker-build-alpha-beta-release: refs: - alpha - beta + - next diff --git a/docker/production/castopod/Dockerfile b/docker/production/castopod/Dockerfile index 77700f5e..5a5fc552 100644 --- a/docker/production/castopod/Dockerfile +++ b/docker/production/castopod/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update && \ mv supercronic /usr/local/bin -FROM docker.io/php:8.2-cli +FROM docker.io/php:8.3-cli ARG UNIT_VERSION=1.31.1 diff --git a/scripts/bundle.sh b/scripts/bundle.sh index 8e1d2ece..fb94dded 100644 --- a/scripts/bundle.sh +++ b/scripts/bundle.sh @@ -2,7 +2,7 @@ set -e VERSION=$1 -COMPOSER_VERSION=$(echo "$VERSION" | sed -r 's/(alpha|beta)./\1/g') +COMPOSER_VERSION=$(echo "$VERSION" | sed -r 's/(alpha|beta|next)./\1/g') # replace composer.json version using jq echo "$( jq '.version = "'$COMPOSER_VERSION'"' composer.json )" > composer.json