diff --git a/.github/workflows/backend-testing.yaml b/.github/workflows/backend-testing.yaml index bdc1872..6ed264c 100644 --- a/.github/workflows/backend-testing.yaml +++ b/.github/workflows/backend-testing.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run check uses: plone/code-analysis-action@v2 @@ -76,7 +76,7 @@ jobs: working-directory: ./backend steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }} uses: plone/setup-plone@v2.0.0 @@ -102,11 +102,11 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | ghcr.io/plone/ploneorg-backend @@ -118,17 +118,17 @@ jobs: type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: platforms: linux/amd64 context: backend @@ -148,7 +148,7 @@ jobs: url: https://testing.plone.org steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Deploy to testing.plone.org uses: kitconcept/docker-stack-deploy@v1.2.0 diff --git a/.github/workflows/code-analysis.yml b/.github/workflows/code-analysis.yml index 8634b9b..f8b21a1 100644 --- a/.github/workflows/code-analysis.yml +++ b/.github/workflows/code-analysis.yml @@ -15,7 +15,7 @@ jobs: working-directory: ./frontend steps: - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js ${{ env.node-version }} uses: actions/setup-node@v3 @@ -51,7 +51,7 @@ jobs: steps: - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Use Node.js ${{ env.node-version }} uses: actions/setup-node@v3 @@ -70,7 +70,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run check uses: plone/code-analysis-action@v2 @@ -82,7 +82,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run check uses: plone/code-analysis-action@v2 @@ -94,7 +94,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run check uses: plone/code-analysis-action@v2 @@ -106,7 +106,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout codebase - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run check uses: plone/code-analysis-action@v2 diff --git a/.github/workflows/deploy-tag-release-live.yml b/.github/workflows/deploy-tag-release-live.yml index ecfe968..533c118 100644 --- a/.github/workflows/deploy-tag-release-live.yml +++ b/.github/workflows/deploy-tag-release-live.yml @@ -32,10 +32,10 @@ jobs: - meta steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: | ${{ env.IMAGE_NAME_PREFIX }}-${{ env.FRONTEND_IMAGE_NAME_SUFFIX }} @@ -46,9 +46,9 @@ jobs: type=pep440,pattern={{version}} type=sha - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/frontend-testing.yml b/.github/workflows/frontend-testing.yml index e577bac..9cfa6cc 100644 --- a/.github/workflows/frontend-testing.yml +++ b/.github/workflows/frontend-testing.yml @@ -94,7 +94,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Docker meta id: meta @@ -110,17 +110,17 @@ jobs: type=raw,value=latest,enable={{is_default_branch}} - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: platforms: linux/amd64 context: frontend/ @@ -141,7 +141,7 @@ jobs: url: https://testing.plone.org steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Deploy to testing.plone.org uses: kitconcept/docker-stack-deploy@v1.2.0 diff --git a/.github/workflows/redeploy-testing.yaml b/.github/workflows/redeploy-testing.yaml index a1efbde..00c50d2 100644 --- a/.github/workflows/redeploy-testing.yaml +++ b/.github/workflows/redeploy-testing.yaml @@ -14,7 +14,7 @@ jobs: url: https://testing.plone.org steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Deploy 'latest' image tags to testing.plone.org uses: kitconcept/docker-stack-deploy@v1.2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dc62a6..260db4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ -1.0.4.dev (unreleased) + +1.0.12.dev0 (unreleased) + +- Update GHA workflow actions to latest versions [fredvd] + +- Update to Volto 16.24.0 [fredvd] + +- Update to Plone backend 6.0.6 [fredvd] - Update to Plone 6.0.3 [fredvd] diff --git a/backend/.gitignore b/backend/.gitignore index f6a3a46..8fb6750 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -44,4 +44,4 @@ live.cfg inituser pip-wheel-metadata pyvenv.cfg -constraints.txt \ No newline at end of file +.python-version diff --git a/backend/constraints.txt b/backend/constraints.txt new file mode 100644 index 0000000..9120178 --- /dev/null +++ b/backend/constraints.txt @@ -0,0 +1 @@ +-c https://dist.plone.org/release/6.0.6/constraints.txt diff --git a/frontend/package.json b/frontend/package.json index 260e138..04b3e26 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -190,5 +190,8 @@ "resolutions": { "@plone/scripts": "^2.2.1" }, - "packageManager": "yarn@3.2.3" + "packageManager": "yarn@3.2.3", + "volta": { + "node": "16.20.2" + } } diff --git a/frontend/version.txt b/frontend/version.txt index e65243f..076895c 100644 --- a/frontend/version.txt +++ b/frontend/version.txt @@ -1 +1 @@ -16.19.0 +16.24.0 diff --git a/version.txt b/version.txt index bb83058..5e1eeef 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.12 +1.0.12.dev0