Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions .github/workflows/backend-testing.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Backend testing.plone.org CI and Deploy
name: Backend testing-stable.plone.org CI and Deploy

on:
push:
Expand All @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand All @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand All @@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand All @@ -52,7 +52,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand All @@ -76,7 +76,7 @@ jobs:
working-directory: ./backend

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- name: Setup Plone ${{ matrix.plone }} with Python ${{ matrix.python }}
uses: plone/setup-plone@v2.0.0
Expand All @@ -102,11 +102,11 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: |
ghcr.io/plone/ploneorg-backend
Expand All @@ -121,14 +121,14 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
platforms: linux/amd64
context: backend
Expand All @@ -145,12 +145,12 @@ jobs:
runs-on: ubuntu-latest
environment:
name: testing.plone.org
url: https://testing.plone.org
url: https://testing-stable.plone.org
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Deploy to testing.plone.org
- name: Deploy to testing-stabls.plone.org
uses: kitconcept/docker-stack-deploy@v1.4.0
with:
registry: "ghcr.io"
Expand All @@ -160,10 +160,10 @@ jobs:
remote_port: ${{ vars.DEPLOY_PORT }}
remote_user: ${{ vars.DEPLOY_USER }}
remote_private_key: ${{ secrets.DEPLOY_SSH }}
stack_file: "devops/stacks/testing.plone.org.yml"
stack_name: "testing-plone-org"
stack_file: "devops/stacks/testing-stable.plone.org.yml"
stack_name: "testing-stable-plone-org"
env_file: |
STACK_NAME=testing-plone-org
STACK_NAME=testing-stable-plone-org
DB_HOST=${{ vars.DB_HOST }}
DB_NAME=${{ vars.DB_NAME }}
DB_USER=${{ vars.DB_USER }}
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/code-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
working-directory: ./frontend
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
Expand All @@ -37,7 +37,7 @@ jobs:
working-directory: ./frontend
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run Prettier
run: npx prettier@2.0.5 --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}' --config=package.json
Expand All @@ -52,10 +52,10 @@ jobs:

steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
Expand All @@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand All @@ -83,7 +83,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand All @@ -95,7 +95,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand All @@ -107,7 +107,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run check
uses: plone/code-analysis-action@v2
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/deploy-tag-release-live.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
TAG: ${{ steps.vars.outputs.TAG }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set Env Vars
id: vars
Expand All @@ -32,10 +32,10 @@ jobs:
- meta
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
uses: docker/metadata-action@v6
with:
images: |
${{ env.IMAGE_NAME_PREFIX }}-${{ env.FRONTEND_IMAGE_NAME_SUFFIX }}
Expand All @@ -48,13 +48,13 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
platforms: linux/amd64
context: frontend
Expand All @@ -69,10 +69,10 @@ jobs:
- meta
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v6
with:
images: |
${{ env.IMAGE_NAME_PREFIX }}-${{ env.BACKEND_IMAGE_NAME_SUFFIX }}
Expand All @@ -87,14 +87,14 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
platforms: linux/amd64
context: backend
Expand All @@ -114,7 +114,7 @@ jobs:
url: https://plone.org
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Deploy to cluster
uses: kitconcept/docker-stack-deploy@v1.4.0
Expand Down
37 changes: 19 additions & 18 deletions .github/workflows/frontend-testing.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Frontend testing.plone.org CI and deploy
name: Frontend testing-stable.plone.org CI and deploy

on:
workflow_dispatch:
Expand All @@ -20,10 +20,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
Expand All @@ -40,7 +40,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Run Prettier
run: npx prettier@2.0.5 --single-quote --check 'src/**/*.{js,jsx,ts,tsx,css,scss}' --config=package.json
Expand All @@ -52,10 +52,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
Expand All @@ -72,10 +72,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout codebase
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Use Node.js ${{ env.node-version }}
uses: actions/setup-node@v4
uses: actions/setup-node@v6
with:
node-version: ${{ env.node-version }}
cache: 'yarn'
Expand All @@ -95,11 +95,11 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Docker meta
id: meta
uses: docker/metadata-action@v4
uses: docker/metadata-action@v6
with:
images: |
ghcr.io/plone/ploneorg-frontend
Expand All @@ -114,14 +114,14 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v5
uses: docker/build-push-action@v7
with:
platforms: linux/amd64
context: frontend/
Expand All @@ -138,13 +138,14 @@ jobs:
- release
runs-on: ubuntu-latest
environment:
# Only exception: keep this to testing.plone.org, otherwise I need to recreate the environment on githubs plone.org repo.
name: testing.plone.org
url: https://testing.plone.org
url: https://testing-stable.plone.org
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Deploy to testing.plone.org
- name: Deploy to testing-stable.plone.org
uses: kitconcept/docker-stack-deploy@v1.4.0
with:
registry: "ghcr.io"
Expand All @@ -154,10 +155,10 @@ jobs:
remote_port: ${{ vars.DEPLOY_PORT }}
remote_user: ${{ vars.DEPLOY_USER }}
remote_private_key: ${{ secrets.DEPLOY_SSH }}
stack_file: "devops/stacks/testing.plone.org.yml"
stack_name: testing-plone-org
stack_file: "devops/stacks/testing-stable.plone.org.yml"
stack_name: testing-stable-plone-org
env_file: |
STACK_NAME=testing-plone-org
STACK_NAME=testing-stable-plone-org
DB_HOST=${{ vars.DB_HOST }}
DB_NAME=${{ vars.DB_NAME }}
DB_USER=${{ vars.DB_USER }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/redeploy-live.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
TAG: ${{ steps.vars.outputs.TAG }}
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Set Env Vars
id: vars
Expand All @@ -29,7 +29,7 @@ jobs:
url: https://plone.org
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Deploy to cluster
uses: kitconcept/docker-stack-deploy@v1.4.0
Expand Down
Loading