Skip to content

Commit

Permalink
check version.json schema, add debian: postgis 3.5.1 (#76)
Browse files Browse the repository at this point in the history
add versions.schema.json
update: debian: postgis 3.5.1
update: ci files
  • Loading branch information
ImreSamu authored Jan 4, 2025
1 parent 5166cae commit 6ee9406
Show file tree
Hide file tree
Showing 36 changed files with 239 additions and 133 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ version: 2.1

orbs:
# https://circleci.com/developer/orbs/orb/circleci/docker
docker: circleci/docker@2.7.1
docker: circleci/docker@2.8.1
# https://circleci.com/developer/orbs/orb/circleci/python
python: circleci/python@2.1.1
python: circleci/python@3.0.0
# https://circleci.com/developer/orbs/orb/circleci/shellcheck
shellcheck: circleci/[email protected]

Expand All @@ -17,7 +17,7 @@ jobs:
# Note: Include parallel GitHub CI jobs when calculating the total load, as they run simultaneously!
parallelism: 8
machine:
image: ubuntu-2204:current
image: ubuntu-2404:current
resource_class: arm.large
environment:
BUILDX_PLATFORMS: linux/arm64v8
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
- run: docker --version
- run: docker info
- run: pip3 install --upgrade pip
- run: pip3 install --upgrade lastversion
- run: pip3 install --upgrade lastversion check-jsonschema
- run: tools/install_manifest-tool.sh
- run: tools/install_dive.sh
- run: tools/environment_init.sh
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/localtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ on:
jobs:
localtest:
name: "testing ./localtest.sh ( update.sh and build test and push to local registry )"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- run: docker ps -a
- run: pip3 install --upgrade pip
- run: pip3 install --upgrade lastversion
- run: pip3 install --upgrade lastversion check-jsonschema
- run: tools/install_manifest-tool.sh
- run: tools/environment_init.sh
- run: ./localtest.sh
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/main.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
shellcheck:
name: Shellcheck
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- name: Run ShellCheck
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
jobs:
update_dockerfiles:
name: "update_dockerfiles"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -24,12 +24,13 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
- run: pip3 install --upgrade pip
- run: pip3 install --upgrade lastversion
- run: pip3 install --upgrade lastversion check-jsonschema
- run: tools/install_manifest-tool.sh
- run: tools/environment_init.sh
- run: ./update.sh
- run: git status
- run: git diff versions.json
- run: check-jsonschema --schemafile versions.schema.json versions.json

- name: Check if versions.json changed
id: version_check
Expand Down Expand Up @@ -64,7 +65,7 @@ jobs:
# https://github.com/peter-evans/create-pull-request
- name: Create Pull Request
if: env.versions_changed == 'true' && steps.check_prs.outputs.create_pr == 'true'
id: create-pr
id: create-pr
uses: peter-evans/create-pull-request@v6
with:
committer: GitHub <[email protected]>
Expand Down Expand Up @@ -97,10 +98,9 @@ jobs:
gh pr close $PR_NUMBER --comment "Closing to trigger full CI/CD pipeline"
sleep 5 # Wait for 5 seconds to ensure the PR is fully closed
gh pr reopen $PR_NUMBER --comment "Reopening to trigger full CI/CD pipeline"
- name: Comment PR
if: steps.create-pr.outputs.pull-request-number
run: |
PR_NUMBER=${{ steps.create-pr.outputs.pull-request-number }}
gh pr comment $PR_NUMBER --body "This PR was automatically created and reopened by the update_dockerfiles workflow to trigger the full CI/CD pipeline. Please review the changes carefully."
4 changes: 2 additions & 2 deletions 12-3.5/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 12-3.5/bookworm/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 12-3.5/bullseye/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 12-3.5/bullseye/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 13-3.5/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 13-3.5/bookworm/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 13-3.5/bullseye/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 13-3.5/bullseye/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 14-3.5/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 14-3.5/bookworm/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 14-3.5/bullseye/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 14-3.5/bullseye/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 15-3.5/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 15-3.5/bookworm/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 15-3.5/bullseye/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 15-3.5/bullseye/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 16-3.5-bundle0/bookworm/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 16-3.5/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 16-3.5/bookworm/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 16-3.5/bullseye/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 16-3.5/bullseye/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 17-3.5/bookworm/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 17-3.5/bookworm/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 17-3.5/bullseye/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 17-3.5/bullseye/tags

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6ee9406

Please sign in to comment.