From d9df60e27f75004ce05ccb495d970c32325cb712 Mon Sep 17 00:00:00 2001 From: Jon Date: Mon, 15 May 2023 13:51:02 +0930 Subject: [PATCH 1/4] fix(readme): typo in dev branch badge !7 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5623770..8c7ff4a 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ This project is hosted on [gitlab](https://gitlab.com/nofusscomputing/projects/a **Development Branch** -![Gitlab build status - development](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F45741845%2Fpipelines%3Fref%3Ddevelopment&logo=gitlab&style=plastic) ![branch release version](https://img.shields.io/badge/dynamic/yaml?color=ff782e&logo=gitlab&style=plastic&label=Release&query=%24.commitizen.version&url=https%3A//gitlab.com/nofusscomputing/projects/ansible/execution_environment-%2Fraw%2Fdevelopment%2F.cz.yaml) +![Gitlab build status - development](https://img.shields.io/badge/dynamic/json?color=ff782e&label=Build&query=0.status&url=https%3A%2F%2Fgitlab.com%2Fapi%2Fv4%2Fprojects%2F45741845%2Fpipelines%3Fref%3Ddevelopment&logo=gitlab&style=plastic) ![branch release version](https://img.shields.io/badge/dynamic/yaml?color=ff782e&logo=gitlab&style=plastic&label=Release&query=%24.commitizen.version&url=https%3A//gitlab.com/nofusscomputing/projects/ansible/execution_environment%2F-%2Fraw%2Fdevelopment%2F.cz.yaml) ----
-- 2.49.0 From f35259f796516e235bd8060c3ccfd058514343aa Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 21 May 2023 14:06:02 +0930 Subject: [PATCH 2/4] fix(ci): update to new template path !7 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fcec1c7..4fa23ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ include: ref: development file: - .gitlab-ci_common.yaml - - type/docker-image.gitlab-ci.yaml + - template/docker-image.gitlab-ci.yaml #- template: Jobs/Container-Scanning.gitlab-ci.yml # see https://gitlab.com/gitlab-org/gitlab/-/issues/381665 -- 2.49.0 From f93ef764ff07c4c8fa7582553a667eeb6d628de1 Mon Sep 17 00:00:00 2001 From: Jon Date: Sun, 21 May 2023 14:06:44 +0930 Subject: [PATCH 3/4] fix(ci): ensure binfmt initialized !7 --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4fa23ae..1deb151 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,6 +38,9 @@ Build/Cache Python Packages: - pip3 install setuptools wheel - pip3 install commitizen==2.21.0 # version specified so current build works. - pip3 install gitlab-ci/gitlab_release/python-module/cz_nfc/. + # see: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1861 + # on why this `docker run` is required. without it multiarch support doesnt work. + - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes - update-binfmts --enable # Important: Ensures execution of other binary formats is enabled in the kernel - docker buildx create --driver=docker-container --driver-opt image=moby/buildkit:v0.11.6 --use - docker buildx inspect --bootstrap -- 2.49.0 From eaab0035ac596c01bd9269e46dda8ce368aa85ef Mon Sep 17 00:00:00 2001 From: Jon Date: Tue, 23 May 2023 15:14:06 +0930 Subject: [PATCH 4/4] chore: update to current head !7 --- gitlab-ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-ci b/gitlab-ci index 18a2808..df2ab75 160000 --- a/gitlab-ci +++ b/gitlab-ci @@ -1 +1 @@ -Subproject commit 18a280878799fe077efa0ed5b11bceedd53eb5c8 +Subproject commit df2ab75e6aa25ac00a75fc5c59419af2e04b1a75 -- 2.49.0