Skip to content

Commit

Permalink
refactoring, updates, ...
Browse files Browse the repository at this point in the history
  • Loading branch information
ImreSamu committed Oct 14, 2023
1 parent 47c76c7 commit 86e9bbb
Show file tree
Hide file tree
Showing 55 changed files with 1,675 additions and 1,657 deletions.
44 changes: 25 additions & 19 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ version: 2.1

orbs:
# https://circleci.com/developer/orbs/orb/circleci/docker
docker: circleci/docker@2.2.0
docker: circleci/docker@2.4.0
# https://circleci.com/developer/orbs/orb/circleci/python
python: circleci/python@2.1.1
# https://circleci.com/developer/orbs/orb/circleci/shellcheck
shellcheck: circleci/shellcheck@3.2.0

jobs:
build-arm64:
Expand All @@ -24,6 +28,15 @@ jobs:
- run: uname -a
- run: docker --version
- run: docker info
- run:
name: Install manifest-tool (linux-arm64 )
command: |
wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
mkdir manifest-tool
tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool
manifest-tool -v
- run: pip3 install lastversion
- run: source tools/environment_init.sh
- run: make check_version
- docker/check:
Expand All @@ -32,11 +45,14 @@ jobs:
docker-password: DOCKERHUB_ACCESS_TOKEN

- run:
name: Conditional Docker Check - Halt if not on master branch or if it's a PR
name: Conditional Docker Check - Halt if not on master branch or if it's a PR or Weekly image exists
command: |
# Check if the current branch is 'master' and the weekly image is not extis
# If weekly image exists, skip docker build and push
if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "${{ matrix.version }}-${{ matrix.variant }}$(IMAGE_VERSION_ID)"; then
source tools/environment_init.sh
echo "check: << parameters.target-version-variant >>${IMAGE_VERSION_ID}"
check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}" || true
if [ "$CIRCLE_BRANCH" == "master" ] && check_image_exists "<< parameters.target-version-variant >>${IMAGE_VERSION_ID}"; then
circleci-agent step halt
fi
Expand All @@ -53,15 +69,6 @@ jobs:
circleci-agent step halt
fi
- run:
name: Install manifest-tool (linux-arm64 )
command: |
wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
mkdir manifest-tool
tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
sudo mv manifest-tool/manifest-tool-linux-arm64 /usr/local/bin/manifest-tool
manifest-tool -v
- run:
name: "Push docker image : make push-<< parameters.target-version-variant >>"
command: |
Expand Down Expand Up @@ -93,24 +100,23 @@ workflows:
"12-3.4-bookworm",
"12-3.4-bullseye",
"13-3.4-alpine3.18",
# --skip-- "13-3.4-bookworm", --> generated with the related bundle job!
"13-3.4-bookworm",
"13-3.4-bullseye",
"13-3.4-bundle-bookworm",
"14-3.4-alpine3.18",
# --skip-- "14-3.4-bookworm", --> generated with the related bundle job!
"14-3.4-bullseye",
"14-3.4-bundle-bookworm",
"14-3.4-bundle0-bookworm",
"15-3.4-alpine3.18",
# --skip-- "15-3.4-bookworm", --> generated with the related bundle job!
"15-3.4-bullseye",
"15-3.4-bundle-bookworm",
"15-3.4-bundle0-bookworm",
"15-master-bookworm",
"15-recentstack-bookworm",
"15-recent-bookworm",
"16-3.4-alpine3.18",
# --skip-- "16-3.4-bookworm", --> generated with the related bundle job!
"16-3.4-bullseye",
"16-3.4-bundle-bookworm",
"16-3.4-bundle0-bookworm",
"16-master-bookworm",
"16-recentstack-bookworm",
"16-recent-bookworm",
#circleci-targets-end
]
8 changes: 8 additions & 0 deletions .github/workflows/localtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,13 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: docker ps -a
- name: Install manifest-tool
run: |
wget https://github.com/estesp/manifest-tool/releases/download/v2.0.8/binaries-manifest-tool-2.0.8.tar.gz
mkdir manifest-tool
tar -xvzf binaries-manifest-tool-2.0.8.tar.gz -C manifest-tool
sudo mv manifest-tool/manifest-tool-linux-amd64 /usr/local/bin/manifest-tool
manifest-tool -v
- run: pip install lastversion
- run: ./localtest.sh
- run: docker images
72 changes: 36 additions & 36 deletions .github/workflows/main.yml

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

39 changes: 21 additions & 18 deletions 11-3.3/alpine3.18/Dockerfile

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

3 changes: 2 additions & 1 deletion 11-3.3/bookworm/Dockerfile

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

3 changes: 2 additions & 1 deletion 11-3.3/bullseye/Dockerfile

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

Loading

0 comments on commit 86e9bbb

Please sign in to comment.