Skip to content

Commit

Permalink
Merge branch 'release/3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisAlejandro committed Nov 21, 2022
2 parents cc349cc + 54823d0 commit 1f153be
Show file tree
Hide file tree
Showing 71 changed files with 575 additions and 1,778 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.8.0
current_version = 3.0.0
tag_name = {new_version}
commit = True
tag = True
Expand Down
15 changes: 1 addition & 14 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,9 @@ updates:
interval: weekly
day: thursday
time: "01:00"
open-pull-requests-limit: 99
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: weekly
day: thursday
time: "01:00"
open-pull-requests-limit: 99
- package-ecosystem: docker
directory: "/"
schedule:
interval: weekly
day: thursday
time: "01:00"
open-pull-requests-limit: 99
ignore:
- dependency-name: dockershelf/python
versions:
- "> 3.10"
time: "01:00"
3 changes: 1 addition & 2 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ on:
jobs:
build:
name: Generating code quality report
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@v3
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand All @@ -24,7 +23,7 @@ jobs:
toxenv: "py39"
- python-version: "3.10"
toxenv: "py310"
- python-version: "3.11.0-alpha.5"
- python-version: "3.11"
toxenv: "py311"
steps:
- name: Checkout repo
Expand All @@ -33,7 +32,7 @@ jobs:
ref: develop
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Installing dependencies
Expand All @@ -46,50 +45,30 @@ jobs:
PYTHON_VERSION: ${{ matrix.python-version }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
python3 update_shelf.py
python3 update.py
approve:
name: Approve pull request
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
needs: build
steps:
- name: Approve
uses: hmarr/[email protected]
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
uses: hmarr/[email protected]
with:
github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
- name: Approve
uses: hmarr/[email protected]
if: github.actor == 'LuisAlejandro'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
github-token: "${{ github.actor == 'LuisAlejandro' && secrets.GITHUB_TOKEN || secrets.PERSONAL_ACCESS_TOKEN }}"

merge:
name: Merge pull request
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
needs: approve
steps:
- name: Merge
uses: actions/github-script@v6
if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
with:
github-token: "${{ secrets.PERSONAL_ACCESS_TOKEN }}"
github-token: "${{ github.actor == 'LuisAlejandro' && secrets.GITHUB_TOKEN || secrets.PERSONAL_ACCESS_TOKEN }}"
script: |
await github.rest.pulls.merge({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number
})
- name: Merge
uses: actions/github-script@v6
if: github.actor == 'LuisAlejandro'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
script: |
await github.rest.pulls.merge({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number
})
48 changes: 21 additions & 27 deletions .github/workflows/push-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -24,34 +23,28 @@ jobs:
docker-image-extra-tags: "dockershelf/debian:testing"
debian-suite: "testing"
- docker-image-name: "dockershelf/debian:sid"
docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
docker-image-extra-tags: "dockershelf/debian:unstable"
debian-suite: "unstable"
- docker-image-name: "dockershelf/latex:basic"
docker-image-extra-tags: "dockershelf/latex:latest"
- docker-image-name: "dockershelf/latex:full"
- docker-image-name: "dockershelf/python:2.7"
- docker-image-name: "dockershelf/python:3.5"
- docker-image-name: "dockershelf/python:3.7"
- docker-image-name: "dockershelf/python:3.9"
docker-image-extra-tags: "dockershelf/python:3"
- docker-image-name: "dockershelf/python:3.10"
- docker-image-name: "dockershelf/python:3.11"
docker-image-extra-tags: "dockershelf/python:latest"
- docker-image-name: "dockershelf/ruby:2.3"
- docker-image-name: "dockershelf/ruby:2.5"
- docker-image-name: "dockershelf/ruby:2.7"
- docker-image-name: "dockershelf/ruby:3.0"
docker-image-extra-tags: "dockershelf/ruby:latest"
- docker-image-name: "dockershelf/node:10"
- docker-image-name: "dockershelf/node:12"
- docker-image-name: "dockershelf/node:14"
- docker-image-name: "dockershelf/node:16"
- docker-image-name: "dockershelf/node:18"
docker-image-extra-tags: "dockershelf/node:latest"
- docker-image-name: "dockershelf/odoo:13.0"
- docker-image-name: "dockershelf/odoo:14.0"
- docker-image-name: "dockershelf/odoo:15.0"
docker-image-extra-tags: "dockershelf/odoo:latest"
- docker-image-name: "dockershelf/python:3.5-bullseye"
- docker-image-name: "dockershelf/python:3.5-sid"
- docker-image-name: "dockershelf/python:3.7-bullseye"
- docker-image-name: "dockershelf/python:3.7-sid"
- docker-image-name: "dockershelf/python:3.9-bullseye"
- docker-image-name: "dockershelf/python:3.9-sid"
- docker-image-name: "dockershelf/python:3.10-bullseye"
- docker-image-name: "dockershelf/python:3.10-sid"
- docker-image-name: "dockershelf/python:3.11-bullseye"
- docker-image-name: "dockershelf/python:3.11-sid"
- docker-image-name: "dockershelf/node:12-bullseye"
- docker-image-name: "dockershelf/node:12-sid"
- docker-image-name: "dockershelf/node:14-bullseye"
- docker-image-name: "dockershelf/node:14-sid"
- docker-image-name: "dockershelf/node:16-bullseye"
- docker-image-name: "dockershelf/node:16-sid"
- docker-image-name: "dockershelf/node:18-bullseye"
- docker-image-name: "dockershelf/node:18-sid"

steps:
- name: Checkout repo
Expand All @@ -61,6 +54,7 @@ jobs:
fetch-depth: 0
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install debootstrap
sudo gem install docker-api serverspec
- name: Building docker image
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-develop.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -24,6 +23,7 @@ jobs:
fetch-depth: 0
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install debootstrap
sudo gem install docker-api serverspec
- name: Building docker image
Expand Down
48 changes: 21 additions & 27 deletions .github/workflows/push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -24,34 +23,28 @@ jobs:
docker-image-extra-tags: "dockershelf/debian:testing"
debian-suite: "testing"
- docker-image-name: "dockershelf/debian:sid"
docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
docker-image-extra-tags: "dockershelf/debian:unstable"
debian-suite: "unstable"
- docker-image-name: "dockershelf/latex:basic"
docker-image-extra-tags: "dockershelf/latex:latest"
- docker-image-name: "dockershelf/latex:full"
- docker-image-name: "dockershelf/python:2.7"
- docker-image-name: "dockershelf/python:3.5"
- docker-image-name: "dockershelf/python:3.7"
- docker-image-name: "dockershelf/python:3.9"
docker-image-extra-tags: "dockershelf/python:3"
- docker-image-name: "dockershelf/python:3.10"
- docker-image-name: "dockershelf/python:3.11"
docker-image-extra-tags: "dockershelf/python:latest"
- docker-image-name: "dockershelf/ruby:2.3"
- docker-image-name: "dockershelf/ruby:2.5"
- docker-image-name: "dockershelf/ruby:2.7"
- docker-image-name: "dockershelf/ruby:3.0"
docker-image-extra-tags: "dockershelf/ruby:latest"
- docker-image-name: "dockershelf/node:10"
- docker-image-name: "dockershelf/node:12"
- docker-image-name: "dockershelf/node:14"
- docker-image-name: "dockershelf/node:16"
- docker-image-name: "dockershelf/node:18"
docker-image-extra-tags: "dockershelf/node:latest"
- docker-image-name: "dockershelf/odoo:13.0"
- docker-image-name: "dockershelf/odoo:14.0"
- docker-image-name: "dockershelf/odoo:15.0"
docker-image-extra-tags: "dockershelf/odoo:latest"
- docker-image-name: "dockershelf/python:3.5-bullseye"
- docker-image-name: "dockershelf/python:3.5-sid"
- docker-image-name: "dockershelf/python:3.7-bullseye"
- docker-image-name: "dockershelf/python:3.7-sid"
- docker-image-name: "dockershelf/python:3.9-bullseye"
- docker-image-name: "dockershelf/python:3.9-sid"
- docker-image-name: "dockershelf/python:3.10-bullseye"
- docker-image-name: "dockershelf/python:3.10-sid"
- docker-image-name: "dockershelf/python:3.11-bullseye"
- docker-image-name: "dockershelf/python:3.11-sid"
- docker-image-name: "dockershelf/node:12-bullseye"
- docker-image-name: "dockershelf/node:12-sid"
- docker-image-name: "dockershelf/node:14-bullseye"
- docker-image-name: "dockershelf/node:14-sid"
- docker-image-name: "dockershelf/node:16-bullseye"
- docker-image-name: "dockershelf/node:16-sid"
- docker-image-name: "dockershelf/node:18-bullseye"
- docker-image-name: "dockershelf/node:18-sid"

steps:
- name: Checkout repo
Expand All @@ -61,6 +54,7 @@ jobs:
fetch-depth: 0
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install debootstrap
sudo gem install docker-api serverspec
- name: Building docker image
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/push-master.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -24,6 +23,7 @@ jobs:
fetch-depth: 0
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install debootstrap
sudo gem install docker-api serverspec
- name: Building docker image
Expand Down
48 changes: 21 additions & 27 deletions .github/workflows/schedule-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -23,34 +22,28 @@ jobs:
docker-image-extra-tags: "dockershelf/debian:testing"
debian-suite: "testing"
- docker-image-name: "dockershelf/debian:sid"
docker-image-extra-tags: "dockershelf/debian:unstable dockershelf/debian:latest"
docker-image-extra-tags: "dockershelf/debian:unstable"
debian-suite: "unstable"
- docker-image-name: "dockershelf/latex:basic"
docker-image-extra-tags: "dockershelf/latex:latest"
- docker-image-name: "dockershelf/latex:full"
- docker-image-name: "dockershelf/python:2.7"
- docker-image-name: "dockershelf/python:3.5"
- docker-image-name: "dockershelf/python:3.7"
- docker-image-name: "dockershelf/python:3.9"
docker-image-extra-tags: "dockershelf/python:3"
- docker-image-name: "dockershelf/python:3.10"
- docker-image-name: "dockershelf/python:3.11"
docker-image-extra-tags: "dockershelf/python:latest"
- docker-image-name: "dockershelf/ruby:2.3"
- docker-image-name: "dockershelf/ruby:2.5"
- docker-image-name: "dockershelf/ruby:2.7"
- docker-image-name: "dockershelf/ruby:3.0"
docker-image-extra-tags: "dockershelf/ruby:latest"
- docker-image-name: "dockershelf/node:10"
- docker-image-name: "dockershelf/node:12"
- docker-image-name: "dockershelf/node:14"
- docker-image-name: "dockershelf/node:16"
- docker-image-name: "dockershelf/node:18"
docker-image-extra-tags: "dockershelf/node:latest"
- docker-image-name: "dockershelf/odoo:13.0"
- docker-image-name: "dockershelf/odoo:14.0"
- docker-image-name: "dockershelf/odoo:15.0"
docker-image-extra-tags: "dockershelf/odoo:latest"
- docker-image-name: "dockershelf/python:3.5-bullseye"
- docker-image-name: "dockershelf/python:3.5-sid"
- docker-image-name: "dockershelf/python:3.7-bullseye"
- docker-image-name: "dockershelf/python:3.7-sid"
- docker-image-name: "dockershelf/python:3.9-bullseye"
- docker-image-name: "dockershelf/python:3.9-sid"
- docker-image-name: "dockershelf/python:3.10-bullseye"
- docker-image-name: "dockershelf/python:3.10-sid"
- docker-image-name: "dockershelf/python:3.11-bullseye"
- docker-image-name: "dockershelf/python:3.11-sid"
- docker-image-name: "dockershelf/node:12-bullseye"
- docker-image-name: "dockershelf/node:12-sid"
- docker-image-name: "dockershelf/node:14-bullseye"
- docker-image-name: "dockershelf/node:14-sid"
- docker-image-name: "dockershelf/node:16-bullseye"
- docker-image-name: "dockershelf/node:16-sid"
- docker-image-name: "dockershelf/node:18-bullseye"
- docker-image-name: "dockershelf/node:18-sid"

steps:
- name: Checkout repo
Expand All @@ -60,6 +53,7 @@ jobs:
fetch-depth: 0
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install debootstrap
sudo gem install docker-api serverspec
- name: Building docker image
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/schedule-master.yml.template
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
if: github.repository == 'Dockershelf/dockershelf'
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
Expand All @@ -23,6 +22,7 @@ jobs:
fetch-depth: 0
- name: Installing dependencies
run: |
sudo apt-get update
sudo apt-get install debootstrap
sudo gem install docker-api serverspec
- name: Building docker image
Expand Down
Loading

0 comments on commit 1f153be

Please sign in to comment.