Skip to content

Commit

Permalink
Merge branch 'release/3.3.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisAlejandro committed Mar 10, 2024
2 parents 1661002 + 1bc9e55 commit 5e22f1d
Show file tree
Hide file tree
Showing 42 changed files with 840 additions and 219 deletions.
18 changes: 8 additions & 10 deletions .github/workflows/clean-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Clean unused tags (develop branch)

on:
workflow_dispatch:
schedule:
- cron: 00 8 * * 3

jobs:
tags-cleanup:
Expand Down Expand Up @@ -30,10 +32,6 @@ jobs:
docker-image-extra-tags: "dockershelf/python:3.7-stable"
- docker-image-name: "dockershelf/python:3.7-sid"
docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7"
- docker-image-name: "dockershelf/python:3.10-bookworm"
docker-image-extra-tags: "dockershelf/python:3.10-stable"
- docker-image-name: "dockershelf/python:3.10-sid"
docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10"
- docker-image-name: "dockershelf/python:3.11-bookworm"
docker-image-extra-tags: "dockershelf/python:3.11-stable"
- docker-image-name: "dockershelf/python:3.11-sid"
Expand Down Expand Up @@ -62,10 +60,6 @@ jobs:
docker-image-extra-tags: "dockershelf/node:20-stable dockershelf/node:latest-stable dockershelf/node:latest-bookworm"
- docker-image-name: "dockershelf/node:20-sid"
docker-image-extra-tags: "dockershelf/node:20-unstable dockershelf/node:20 dockershelf/node:latest-unstable dockershelf/node:latest-sid dockershelf/node:latest"
- docker-image-name: "dockershelf/go:1.18-bookworm"
docker-image-extra-tags: "dockershelf/go:1.18-stable"
- docker-image-name: "dockershelf/go:1.18-sid"
docker-image-extra-tags: "dockershelf/go:1.18-unstable dockershelf/go:1.18"
- docker-image-name: "dockershelf/go:1.19-bookworm"
docker-image-extra-tags: "dockershelf/go:1.19-stable"
- docker-image-name: "dockershelf/go:1.19-sid"
Expand All @@ -75,9 +69,13 @@ jobs:
- docker-image-name: "dockershelf/go:1.20-sid"
docker-image-extra-tags: "dockershelf/go:1.20-unstable dockershelf/go:1.20"
- docker-image-name: "dockershelf/go:1.21-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable"
- docker-image-name: "dockershelf/go:1.21-sid"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21"
- docker-image-name: "dockershelf/go:1.22-bookworm"
docker-image-extra-tags: "dockershelf/go:1.22-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
- docker-image-name: "dockershelf/go:1.22-sid"
docker-image-extra-tags: "dockershelf/go:1.22-unstable dockershelf/go:1.22 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"

steps:
- name: Install Docker hub-tool
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/clean-develop.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Clean unused tags (develop branch)

on:
workflow_dispatch:
schedule:
- cron: 00 8 * * 3

jobs:
tags-cleanup:
Expand Down
16 changes: 6 additions & 10 deletions .github/workflows/clean-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ jobs:
docker-image-extra-tags: "dockershelf/python:3.7-stable"
- docker-image-name: "dockershelf/python:3.7-sid"
docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7"
- docker-image-name: "dockershelf/python:3.10-bookworm"
docker-image-extra-tags: "dockershelf/python:3.10-stable"
- docker-image-name: "dockershelf/python:3.10-sid"
docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10"
- docker-image-name: "dockershelf/python:3.11-bookworm"
docker-image-extra-tags: "dockershelf/python:3.11-stable"
- docker-image-name: "dockershelf/python:3.11-sid"
Expand Down Expand Up @@ -64,10 +60,6 @@ jobs:
docker-image-extra-tags: "dockershelf/node:20-stable dockershelf/node:latest-stable dockershelf/node:latest-bookworm"
- docker-image-name: "dockershelf/node:20-sid"
docker-image-extra-tags: "dockershelf/node:20-unstable dockershelf/node:20 dockershelf/node:latest-unstable dockershelf/node:latest-sid dockershelf/node:latest"
- docker-image-name: "dockershelf/go:1.18-bookworm"
docker-image-extra-tags: "dockershelf/go:1.18-stable"
- docker-image-name: "dockershelf/go:1.18-sid"
docker-image-extra-tags: "dockershelf/go:1.18-unstable dockershelf/go:1.18"
- docker-image-name: "dockershelf/go:1.19-bookworm"
docker-image-extra-tags: "dockershelf/go:1.19-stable"
- docker-image-name: "dockershelf/go:1.19-sid"
Expand All @@ -77,9 +69,13 @@ jobs:
- docker-image-name: "dockershelf/go:1.20-sid"
docker-image-extra-tags: "dockershelf/go:1.20-unstable dockershelf/go:1.20"
- docker-image-name: "dockershelf/go:1.21-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable"
- docker-image-name: "dockershelf/go:1.21-sid"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21"
- docker-image-name: "dockershelf/go:1.22-bookworm"
docker-image-extra-tags: "dockershelf/go:1.22-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
- docker-image-name: "dockershelf/go:1.22-sid"
docker-image-extra-tags: "dockershelf/go:1.22-unstable dockershelf/go:1.22 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"

steps:
- name: Install Docker hub-tool
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: develop

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: python
config-file: ./.github/codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
45 changes: 45 additions & 0 deletions .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Keep scheduled workflows alive

on:
workflow_dispatch:
schedule:
- cron: 0 0 1 * *

jobs:
keepalive:
runs-on: ubuntu-22.04
steps:
- name: Disable workflows
uses: actions/github-script@v6
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
script: |
const workflows = await github.rest.actions.listRepoWorkflows({
owner: context.repo.owner,
repo: context.repo.repo,
});
for (const workflow of workflows.data.workflows) {
await github.rest.actions.disableWorkflow({
owner: context.repo.owner,
repo: context.repo.repo,
workflow_id: workflow.id,
});
}
- name: Enable workflows
uses: actions/github-script@v6
with:
github-token: '${{ secrets.GITHUB_TOKEN }}'
script: |
const workflows = await github.rest.actions.listRepoWorkflows({
owner: context.repo.owner,
repo: context.repo.repo,
});
for (const workflow of workflows.data.workflows) {
await github.rest.actions.enableWorkflow({
owner: context.repo.owner,
repo: context.repo.repo,
workflow_id: workflow.id,
});
}
11 changes: 5 additions & 6 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,23 @@ jobs:
toxenv: "py310"
- python-version: "3.11"
toxenv: "py311"
- python-version: "3.12.0-rc.2"
- python-version: "3.12"
toxenv: "py312"
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Installing dependencies
run: |
sudo apt-get install libxml2-dev libxslt-dev
python3 -m pip install -r requirements-dev.txt
python3 -m pip install -r requirements.txt
- name: Functional test
Expand All @@ -58,7 +57,7 @@ jobs:
if: github.actor == github.repository_owner || github.actor == 'dependabot[bot]'
steps:
- name: Approve
uses: hmarr/auto-approve-action@v3.2.1
uses: hmarr/auto-approve-action@v4.0.0
with:
github-token: "${{ github.actor == github.repository_owner && secrets.GITHUB_TOKEN || secrets.PERSONAL_ACCESS_TOKEN }}"

Expand All @@ -69,7 +68,7 @@ jobs:
if: github.actor == github.repository_owner || github.actor == 'dependabot[bot]'
steps:
- name: Merge
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
github-token: "${{ github.actor == github.repository_owner && secrets.GITHUB_TOKEN || secrets.PERSONAL_ACCESS_TOKEN }}"
script: |
Expand Down
22 changes: 9 additions & 13 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ jobs:
docker-image-extra-tags: "dockershelf/python:3.7-stable"
- docker-image-name: "dockershelf/python:3.7-sid"
docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7"
- docker-image-name: "dockershelf/python:3.10-bookworm"
docker-image-extra-tags: "dockershelf/python:3.10-stable"
- docker-image-name: "dockershelf/python:3.10-sid"
docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10"
- docker-image-name: "dockershelf/python:3.11-bookworm"
docker-image-extra-tags: "dockershelf/python:3.11-stable"
- docker-image-name: "dockershelf/python:3.11-sid"
Expand Down Expand Up @@ -64,10 +60,6 @@ jobs:
docker-image-extra-tags: "dockershelf/node:20-stable dockershelf/node:latest-stable dockershelf/node:latest-bookworm"
- docker-image-name: "dockershelf/node:20-sid"
docker-image-extra-tags: "dockershelf/node:20-unstable dockershelf/node:20 dockershelf/node:latest-unstable dockershelf/node:latest-sid dockershelf/node:latest"
- docker-image-name: "dockershelf/go:1.18-bookworm"
docker-image-extra-tags: "dockershelf/go:1.18-stable"
- docker-image-name: "dockershelf/go:1.18-sid"
docker-image-extra-tags: "dockershelf/go:1.18-unstable dockershelf/go:1.18"
- docker-image-name: "dockershelf/go:1.19-bookworm"
docker-image-extra-tags: "dockershelf/go:1.19-stable"
- docker-image-name: "dockershelf/go:1.19-sid"
Expand All @@ -77,22 +69,26 @@ jobs:
- docker-image-name: "dockershelf/go:1.20-sid"
docker-image-extra-tags: "dockershelf/go:1.20-unstable dockershelf/go:1.20"
- docker-image-name: "dockershelf/go:1.21-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable"
- docker-image-name: "dockershelf/go:1.21-sid"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21"
- docker-image-name: "dockershelf/go:1.22-bookworm"
docker-image-extra-tags: "dockershelf/go:1.22-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
- docker-image-name: "dockershelf/go:1.22-sid"
docker-image-extra-tags: "dockershelf/go:1.22-unstable dockershelf/go:1.22 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- uses: ruby/setup-ruby@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/push-master.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- uses: ruby/setup-ruby@v1
with:
Expand Down
22 changes: 9 additions & 13 deletions .github/workflows/schedule-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ jobs:
docker-image-extra-tags: "dockershelf/python:3.7-stable"
- docker-image-name: "dockershelf/python:3.7-sid"
docker-image-extra-tags: "dockershelf/python:3.7-unstable dockershelf/python:3.7"
- docker-image-name: "dockershelf/python:3.10-bookworm"
docker-image-extra-tags: "dockershelf/python:3.10-stable"
- docker-image-name: "dockershelf/python:3.10-sid"
docker-image-extra-tags: "dockershelf/python:3.10-unstable dockershelf/python:3.10"
- docker-image-name: "dockershelf/python:3.11-bookworm"
docker-image-extra-tags: "dockershelf/python:3.11-stable"
- docker-image-name: "dockershelf/python:3.11-sid"
Expand Down Expand Up @@ -63,10 +59,6 @@ jobs:
docker-image-extra-tags: "dockershelf/node:20-stable dockershelf/node:latest-stable dockershelf/node:latest-bookworm"
- docker-image-name: "dockershelf/node:20-sid"
docker-image-extra-tags: "dockershelf/node:20-unstable dockershelf/node:20 dockershelf/node:latest-unstable dockershelf/node:latest-sid dockershelf/node:latest"
- docker-image-name: "dockershelf/go:1.18-bookworm"
docker-image-extra-tags: "dockershelf/go:1.18-stable"
- docker-image-name: "dockershelf/go:1.18-sid"
docker-image-extra-tags: "dockershelf/go:1.18-unstable dockershelf/go:1.18"
- docker-image-name: "dockershelf/go:1.19-bookworm"
docker-image-extra-tags: "dockershelf/go:1.19-stable"
- docker-image-name: "dockershelf/go:1.19-sid"
Expand All @@ -76,22 +68,26 @@ jobs:
- docker-image-name: "dockershelf/go:1.20-sid"
docker-image-extra-tags: "dockershelf/go:1.20-unstable dockershelf/go:1.20"
- docker-image-name: "dockershelf/go:1.21-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
docker-image-extra-tags: "dockershelf/go:1.21-stable"
- docker-image-name: "dockershelf/go:1.21-sid"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"
docker-image-extra-tags: "dockershelf/go:1.21-unstable dockershelf/go:1.21"
- docker-image-name: "dockershelf/go:1.22-bookworm"
docker-image-extra-tags: "dockershelf/go:1.22-stable dockershelf/go:latest-stable dockershelf/go:latest-bookworm"
- docker-image-name: "dockershelf/go:1.22-sid"
docker-image-extra-tags: "dockershelf/go:1.22-unstable dockershelf/go:1.22 dockershelf/go:latest-unstable dockershelf/go:latest-sid dockershelf/go:latest"

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- uses: ruby/setup-ruby@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/schedule-master.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3

- uses: ruby/setup-ruby@v1
with:
Expand Down
Loading

0 comments on commit 5e22f1d

Please sign in to comment.