sporq/zmk-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sporq:ff7ef761d0d9e7a5204c854e4db4fae63bf7acee
Branches Tags
sporq:3.2-branch
..
compare: sporq:15c1cac7043698d29558adcc9a75fa3f36fca4d6
Branches Tags
sporq:3.2-branch

No commits in common. "ff7ef761d0d9e7a5204c854e4db4fae63bf7acee" and "15c1cac7043698d29558adcc9a75fa3f36fca4d6" have entirely different histories.
ff7ef761d0 ... 15c1cac704

3 changed files with 127 additions and 126 deletions
Show Stats Expand all files Collapse all files

215
.github/workflows/containers.yml vendored
View File

@ -1,8 +1,8 @@
name: Containers name: Containers
env: env:
zephyr-version: 3.2.0 zephyr-version: 3.0.0
zephyr-sdk-version: 0.15.2 zephyr-sdk-version: 0.13.2
sha-abbrev-length: 12 sha-abbrev-length: 12
no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
ignore-actions-cache: ${{ secrets.IGNORE_ACTIONS_CACHE != null }} ignore-actions-cache: ${{ secrets.IGNORE_ACTIONS_CACHE != null }}
@ -32,19 +32,22 @@ jobs:
steps: steps:
- name: Timestamp - name: Timestamp
id: timestamp id: timestamp
run: echo "timestamp=$(date +%Y%m%d%H%M%S)" >> $GITHUB_OUTPUT run: echo ::set-output name=timestamp::$(date +%Y%m%d%H%M%S)
architectures: architectures:
runs-on: ubuntu-latest runs-on: ubuntu-latest
outputs: outputs:
json: ${{ steps.import.outputs.json }} json: ${{ steps.import.outputs.json }}
steps: steps:
- name: Install yaml2json
run: python3 -m pip install remarshal
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v2
- name: Import from architectures.yml - name: Import from architectures.yml
id: import id: import
run: echo "json=$(yaml2json architectures.yml | jq -c .)" >> $GITHUB_OUTPUT shell: python
run: |
import yaml, json
with open('architectures.yml', 'r') as file:
architectures = yaml.safe_load(file)
print('::set-output name=json::' + json.dumps(architectures))
tags: tags:
needs: needs:
- timestamp - timestamp
@ -78,12 +81,12 @@ jobs:
MAJOR_MINOR=${MAJOR}.${MINOR} MAJOR_MINOR=${MAJOR}.${MINOR}
MAJOR_MINOR_BRANCH=${MAJOR_MINOR}-branch MAJOR_MINOR_BRANCH=${MAJOR_MINOR}-branch
echo "branch=${BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=branch::${BRANCH}
echo "base=${BASE}" >> $GITHUB_OUTPUT echo ::set-output name=base::${BASE}
echo "candidate=${CANDIDATE}" >> $GITHUB_OUTPUT echo ::set-output name=candidate::${CANDIDATE}
echo "versions=${VERSIONS}" >> $GITHUB_OUTPUT echo ::set-output name=versions::${VERSIONS}
echo "major-minor=${MAJOR_MINOR}" >> $GITHUB_OUTPUT echo ::set-output name=major-minor::${MAJOR_MINOR}
echo "major-minor-branch=${MAJOR_MINOR_BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=major-minor-branch::${MAJOR_MINOR_BRANCH}
dev-generic: dev-generic:
needs: needs:
- timestamp - timestamp
@ -94,14 +97,14 @@ jobs:
- name: Login to Docker Hub - name: Login to Docker Hub
id: docker-hub-login id: docker-hub-login
if: ${{ env.docker-hub-credentials == 'true' }} if: ${{ env.docker-hub-credentials == 'true' }}
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
id: ghcr-login id: ghcr-login
if: ${{ env.ghcr-credentials == 'true' }} if: ${{ env.ghcr-credentials == 'true' }}
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }} username: ${{ secrets.GHCR_USERNAME }}
@ -116,18 +119,18 @@ jobs:
BASE: ${{ needs.tags.outputs.base }} BASE: ${{ needs.tags.outputs.base }}
MAJOR_MINOR_BRANCH: ${{ needs.tags.outputs.major-minor-branch }} MAJOR_MINOR_BRANCH: ${{ needs.tags.outputs.major-minor-branch }}
run: | run: |
echo "local=/tmp/.buildx/dev-generic" >> $GITHUB_OUTPUT echo ::set-output name=local::/tmp/.buildx/dev-generic
echo "local-new=/tmp/.buildx/dev-generic-new" >> $GITHUB_OUTPUT echo ::set-output name=local-new::/tmp/.buildx/dev-generic-new
echo "branch=docker.io/${NS}/${REPOSITORY}:${BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=branch::docker.io/${NS}/${REPOSITORY}:${BRANCH}
if [ ! -z "$BASE" ]; then if [ ! -z "$BASE" ]; then
echo "base=docker.io/${NS}/${REPOSITORY}:${BASE}" >> $GITHUB_OUTPUT echo ::set-output name=base::docker.io/${NS}/${REPOSITORY}:${BASE}
fi fi
echo "major-minor-branch=docker.io/${NS}/${REPOSITORY}:${MAJOR_MINOR_BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=major-minor-branch::docker.io/${NS}/${REPOSITORY}:${MAJOR_MINOR_BRANCH}
echo "branch-upstream=docker.io/${NSU}/${REPOSITORY}:${BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=branch-upstream::docker.io/${NSU}/${REPOSITORY}:${BRANCH}
echo "major-minor-branch-upstream=docker.io/${NSU}/${REPOSITORY}:${MAJOR_MINOR_BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=major-minor-branch-upstream::docker.io/${NSU}/${REPOSITORY}:${MAJOR_MINOR_BRANCH}
- name: Set up cache - name: Set up cache
id: cache id: cache
uses: actions/cache@v3 uses: actions/cache@v2
env: env:
cache-name: dev-generic cache-name: dev-generic
with: with:
@ -136,11 +139,11 @@ jobs:
restore-keys: | restore-keys: |
${{ runner.os }}/${{ env.cache-name }}/${{ github.run_id }} ${{ runner.os }}/${{ env.cache-name }}/${{ github.run_id }}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v1
- name: Build to local cache - name: Build to local cache
uses: docker/build-push-action@v3 uses: docker/build-push-action@v2
with: with:
target: dev-generic target: dev-generic
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
@ -157,7 +160,7 @@ jobs:
cache-to: type=local,dest=${{ steps.paths.outputs.local-new }},mode=max cache-to: type=local,dest=${{ steps.paths.outputs.local-new }},mode=max
- name: Push to registry cache - name: Push to registry cache
if: ${{ env.docker-hub-credentials == 'true' }} if: ${{ env.docker-hub-credentials == 'true' }}
uses: docker/build-push-action@v3 uses: docker/build-push-action@v2
with: with:
target: dev-generic target: dev-generic
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
@ -200,14 +203,14 @@ jobs:
- name: Login to Docker Hub - name: Login to Docker Hub
id: docker-hub-login id: docker-hub-login
if: ${{ env.docker-hub-credentials == 'true' }} if: ${{ env.docker-hub-credentials == 'true' }}
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
id: ghcr-login id: ghcr-login
if: ${{ env.ghcr-credentials == 'true' }} if: ${{ env.ghcr-credentials == 'true' }}
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }} username: ${{ secrets.GHCR_USERNAME }}
@ -216,8 +219,8 @@ jobs:
id: repositories id: repositories
shell: bash shell: bash
run: | run: |
echo "build=zmk-build-${{ matrix.architecture }}" >> $GITHUB_OUTPUT echo ::set-output name=build::zmk-build-${{ matrix.architecture }}
echo "dev=zmk-dev-${{ matrix.architecture }}" >> $GITHUB_OUTPUT echo ::set-output name=dev::zmk-dev-${{ matrix.architecture }}
- name: Define paths - name: Define paths
id: paths id: paths
shell: bash shell: bash
@ -231,23 +234,23 @@ jobs:
BASE: ${{ needs.tags.outputs.base }} BASE: ${{ needs.tags.outputs.base }}
MAJOR_MINOR_BRANCH: ${{ needs.tags.outputs.major-minor-branch }} MAJOR_MINOR_BRANCH: ${{ needs.tags.outputs.major-minor-branch }}
run: | run: |
echo "dev-generic=/tmp/.buildx/dev-generic" >> $GITHUB_OUTPUT echo ::set-output name=dev-generic::/tmp/.buildx/dev-generic
echo "build-candidate=docker.io/${NS}/${BUILD}:${CANDIDATE}" >> $GITHUB_OUTPUT echo ::set-output name=build-candidate::docker.io/${NS}/${BUILD}:${CANDIDATE}
echo "build-branch=docker.io/${NS}/${BUILD}:${BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=build-branch::docker.io/${NS}/${BUILD}:${BRANCH}
if [ ! -z "$BASE" ]; then if [ ! -z "$BASE" ]; then
echo "build-base=docker.io/${NS}/${BUILD}:${BASE}" >> $GITHUB_OUTPUT echo ::set-output name=build-base::docker.io/${NS}/${BUILD}:${BASE}
fi fi
echo "build-major-minor-branch=docker.io/${NS}/${BUILD}:${MAJOR_MINOR_BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=build-major-minor-branch::docker.io/${NS}/${BUILD}:${MAJOR_MINOR_BRANCH}
echo "build-branch-upstream=docker.io/${NSU}/${BUILD}:${BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=build-branch-upstream::docker.io/${NSU}/${BUILD}:${BRANCH}
echo "build-major-minor-branch-upstream=docker.io/${NSU}/${BUILD}:${MAJOR_MINOR_BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=build-major-minor-branch-upstream::docker.io/${NSU}/${BUILD}:${MAJOR_MINOR_BRANCH}
echo "dev-candidate=docker.io/${NS}/${DEV}:${CANDIDATE}" >> $GITHUB_OUTPUT echo ::set-output name=dev-candidate::docker.io/${NS}/${DEV}:${CANDIDATE}
echo "dev-branch=docker.io/${NS}/${DEV}:${BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=dev-branch::docker.io/${NS}/${DEV}:${BRANCH}
if [ ! -z "$BASE" ]; then if [ ! -z "$BASE" ]; then
echo "dev-base=docker.io/${NS}/${DEV}:${BASE}" >> $GITHUB_OUTPUT echo ::set-output name=dev-base::docker.io/${NS}/${DEV}:${BASE}
fi fi
echo "dev-major-minor-branch=docker.io/${NS}/${DEV}:${MAJOR_MINOR_BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=dev-major-minor-branch::docker.io/${NS}/${DEV}:${MAJOR_MINOR_BRANCH}
echo "dev-branch-upstream=docker.io/${NSU}/${DEV}:${BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=dev-branch-upstream::docker.io/${NSU}/${DEV}:${BRANCH}
echo "dev-major-minor-branch-upstream=docker.io/${NSU}/${DEV}:${MAJOR_MINOR_BRANCH}" >> $GITHUB_OUTPUT echo ::set-output name=dev-major-minor-branch-upstream::docker.io/${NSU}/${DEV}:${MAJOR_MINOR_BRANCH}
- name: Define build-args - name: Define build-args
id: build-args id: build-args
shell: bash shell: bash
@ -257,11 +260,12 @@ jobs:
ARCHITECTURE=${{ matrix.architecture }} ARCHITECTURE=${{ matrix.architecture }}
ZEPHYR_SDK_VERSION=${{ env.zephyr-sdk-version }} ZEPHYR_SDK_VERSION=${{ env.zephyr-sdk-version }}
" "
# Escapes %, \n and \r
delimiter="$(openssl rand -hex 8)" # See: https://github.community/t/set-output-truncates-multiline-strings/16852
echo "list<<${delimiter}" >> $GITHUB_OUTPUT LIST="${LIST//'%'/'%25'}"
echo "${LIST}" >> $GITHUB_OUTPUT LIST="${LIST//$'\n'/'%0A'}"
echo "${delimiter}" >> $GITHUB_OUTPUT LIST="${LIST//$'\r'/'%0D'}"
echo ::set-output name=list::${LIST}
- name: Define labels - name: Define labels
id: labels id: labels
shell: bash shell: bash
@ -270,25 +274,26 @@ jobs:
org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }} org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.revision=${{ github.sha }}
" "
delimiter="$(openssl rand -hex 8)" # Escapes %, \n and \r
# See: https://github.community/t/set-output-truncates-multiline-strings/16852
echo "list<<${delimiter}" >> $GITHUB_OUTPUT LIST="${LIST//'%'/'%25'}"
echo "${LIST}" >> $GITHUB_OUTPUT LIST="${LIST//$'\n'/'%0A'}"
echo "${delimiter}" >> $GITHUB_OUTPUT LIST="${LIST//$'\r'/'%0D'}"
echo ::set-output name=list::${LIST}
- name: Set up dev-generic cache - name: Set up dev-generic cache
id: dev-generic-cache id: dev-generic-cache
uses: actions/cache@v3 uses: actions/cache@v2
env: env:
cache-name: dev-generic cache-name: dev-generic
with: with:
path: ${{ steps.paths.outputs.dev-generic }} path: ${{ steps.paths.outputs.dev-generic }}
key: ${{ runner.os }}/${{ env.cache-name }}/${{ github.run_id }}/${{ needs.timestamp.outputs.timestamp }} key: ${{ runner.os }}/${{ env.cache-name }}/${{ github.run_id }}/${{ needs.timestamp.outputs.timestamp }}
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v1
- name: Build and load 'build' candidate image - name: Build and load 'build' candidate image
uses: docker/build-push-action@v3 uses: docker/build-push-action@v2
with: with:
target: build target: build
build-args: | build-args: |
@ -309,7 +314,7 @@ jobs:
cache-to: type=inline cache-to: type=inline
load: true load: true
- name: Build and load 'dev' candidate image - name: Build and load 'dev' candidate image
uses: docker/build-push-action@v3 uses: docker/build-push-action@v2
with: with:
target: dev target: dev
build-args: | build-args: |
@ -331,12 +336,12 @@ jobs:
cache-to: type=inline cache-to: type=inline
load: true load: true
- name: Checkout ZMK - name: Checkout ZMK
uses: actions/checkout@v3 uses: actions/checkout@v2
with: with:
repository: ${{ env.zmk-repository }} repository: ${{ env.zmk-repository }}
ref: ${{ env.zmk-ref }} ref: ${{ env.zmk-ref }}
- name: Cache Zephyr modules - name: Cache Zephyr modules
uses: actions/cache@v3 uses: actions/cache@v2
env: env:
cache-name: zephyr-modules cache-name: zephyr-modules
with: with:
@ -432,7 +437,7 @@ jobs:
run: docker stop candidate run: docker stop candidate
- name: Build and push 'build' candidate image (x86_64 and arm64) - name: Build and push 'build' candidate image (x86_64 and arm64)
if: ${{ steps.docker-hub-login.outcome == 'success' }} if: ${{ steps.docker-hub-login.outcome == 'success' }}
uses: docker/build-push-action@v3 uses: docker/build-push-action@v2
with: with:
target: build target: build
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
@ -455,7 +460,7 @@ jobs:
push: true push: true
- name: Build and push 'dev' candidate image (x86_64 + arm64) - name: Build and push 'dev' candidate image (x86_64 + arm64)
if: ${{ steps.docker-hub-login.outcome == 'success' }} if: ${{ steps.docker-hub-login.outcome == 'success' }}
uses: docker/build-push-action@v3 uses: docker/build-push-action@v2
with: with:
target: dev target: dev
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
@ -509,28 +514,28 @@ jobs:
TAG=${GITHUB_REF#refs/tags/} TAG=${GITHUB_REF#refs/tags/}
PATTERN="^(.+?)-((([0-9]{4})(0[1-9]|1[012])(0[1-9]|[12][0-9]|3[01]))(([01]?[0-9]|2[0-3])([0-5][0-9])([0-5][0-9])))-(([0-9]+)\.([0-9]+)\.([0-9]+))-(([0-9]+)\.([0-9]+)\.([0-9]+))-([0-9a-fA-F]+)-([0-9]+)$" PATTERN="^(.+?)-((([0-9]{4})(0[1-9]|1[012])(0[1-9]|[12][0-9]|3[01]))(([01]?[0-9]|2[0-3])([0-5][0-9])([0-5][0-9])))-(([0-9]+)\.([0-9]+)\.([0-9]+))-(([0-9]+)\.([0-9]+)\.([0-9]+))-([0-9a-fA-F]+)-([0-9]+)$"
if [[ "${TAG}" =~ $PATTERN ]]; then if [[ "${TAG}" =~ $PATTERN ]]; then
echo "tag=${TAG}" >> $GITHUB_OUTPUT echo ::set-output name=tag::${TAG}
echo "branch=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT echo ::set-output name=branch::${BASH_REMATCH[1]}
echo "datetime=${BASH_REMATCH[2]}" >> $GITHUB_OUTPUT echo ::set-output name=datetime::${BASH_REMATCH[2]}
echo "date=${BASH_REMATCH[3]}" >> $GITHUB_OUTPUT echo ::set-output name=date::${BASH_REMATCH[3]}
echo "year=${BASH_REMATCH[4]}" >> $GITHUB_OUTPUT echo ::set-output name=year::${BASH_REMATCH[4]}
echo "month=${BASH_REMATCH[5]}" >> $GITHUB_OUTPUT echo ::set-output name=month::${BASH_REMATCH[5]}
echo "day=${BASH_REMATCH[6]}" >> $GITHUB_OUTPUT echo ::set-output name=day::${BASH_REMATCH[6]}
echo "time=${BASH_REMATCH[7]}" >> $GITHUB_OUTPUT echo ::set-output name=time::${BASH_REMATCH[7]}
echo "hour=${BASH_REMATCH[8]}" >> $GITHUB_OUTPUT echo ::set-output name=hour::${BASH_REMATCH[8]}
echo "minute=${BASH_REMATCH[9]}" >> $GITHUB_OUTPUT echo ::set-output name=minute::${BASH_REMATCH[9]}
echo "second=${BASH_REMATCH[10]}" >> $GITHUB_OUTPUT echo ::set-output name=second::${BASH_REMATCH[10]}
echo "zephyr-version=${BASH_REMATCH[11]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-version::${BASH_REMATCH[11]}
echo "zephyr-version-major=${BASH_REMATCH[12]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-version-major::${BASH_REMATCH[12]}
echo "zephyr-version-minor=${BASH_REMATCH[13]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-version-minor::${BASH_REMATCH[13]}
echo "zephyr-version-patch=${BASH_REMATCH[14]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-version-patch::${BASH_REMATCH[14]}
echo "zephyr-sdk-version=${BASH_REMATCH[15]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-sdk-version::${BASH_REMATCH[15]}
echo "zephyr-sdk-version-major=${BASH_REMATCH[16]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-sdk-version-major::${BASH_REMATCH[16]}
echo "zephyr-sdk-version-minor=${BASH_REMATCH[17]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-sdk-version-minor::${BASH_REMATCH[17]}
echo "zephyr-sdk-version-patch=${BASH_REMATCH[18]}" >> $GITHUB_OUTPUT echo ::set-output name=zephyr-sdk-version-patch::${BASH_REMATCH[18]}
SHA=${BASH_REMATCH[19]} SHA=${BASH_REMATCH[19]}
echo "sha=${SHA}" >> $GITHUB_OUTPUT echo ::set-output name=sha::${SHA}
echo "run-id=${BASH_REMATCH[20]}" >> $GITHUB_OUTPUT echo ::set-output name=run-id::${BASH_REMATCH[20]}
if [[ "${{ github.sha }}" != ${SHA}* ]]; then if [[ "${{ github.sha }}" != ${SHA}* ]]; then
echo "Hashes do not match!" echo "Hashes do not match!"
@ -555,18 +560,16 @@ jobs:
- build - build
- dev - dev
steps: steps:
- name: Install skopeo
run: sudo apt-get install -y skopeo
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
id: ghcr-login id: ghcr-login
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }} username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }} password: ${{ secrets.GHCR_TOKEN }}
- name: Login to Docker Hub - name: Login to Docker Hub
id: docker-hub-login id: docker-hub-login
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
@ -582,11 +585,18 @@ jobs:
run: | run: |
REPOSITORY=zmk-${TARGET}-${ARCHITECTURE} REPOSITORY=zmk-${TARGET}-${ARCHITECTURE}
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://docker.io/${DHNS}/${REPOSITORY}:${VERSIONS} docker pull docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE}
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://docker.io/${DHNS}/${REPOSITORY}:${MAJOR_MINOR} docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker.io/${DHNS}/${REPOSITORY}:${VERSIONS}
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://ghcr.io/${GHCRNS}/${REPOSITORY}:${CANDIDATE} docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker.io/${DHNS}/${REPOSITORY}:${MAJOR_MINOR}
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://ghcr.io/${GHCRNS}/${REPOSITORY}:${VERSIONS} docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} ghcr.io/${GHCRNS}/${REPOSITORY}:${CANDIDATE}
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://ghcr.io/${GHCRNS}/${REPOSITORY}:${MAJOR_MINOR} docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} ghcr.io/${GHCRNS}/${REPOSITORY}:${VERSIONS}
docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} ghcr.io/${GHCRNS}/${REPOSITORY}:${MAJOR_MINOR}
docker push docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE}
docker push docker.io/${DHNS}/${REPOSITORY}:${VERSIONS}
docker push docker.io/${DHNS}/${REPOSITORY}:${MAJOR_MINOR}
docker push ghcr.io/${GHCRNS}/${REPOSITORY}:${CANDIDATE}
docker push ghcr.io/${GHCRNS}/${REPOSITORY}:${VERSIONS}
docker push ghcr.io/${GHCRNS}/${REPOSITORY}:${MAJOR_MINOR}
git-tag: git-tag:
needs: needs:
- tags - tags
@ -594,7 +604,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v2
- name: Tag - name: Tag
env: env:
TAG: ${{ needs.tags.outputs.major-minor }} TAG: ${{ needs.tags.outputs.major-minor }}
@ -614,8 +624,8 @@ jobs:
TAG=${GITHUB_REF#refs/tags/} TAG=${GITHUB_REF#refs/tags/}
PATTERN="^(.+?)-stable$" PATTERN="^(.+?)-stable$"
if [[ "${TAG}" =~ $PATTERN ]]; then if [[ "${TAG}" =~ $PATTERN ]]; then
echo "tag=${TAG}" >> $GITHUB_OUTPUT echo ::set-output name=tag::${TAG}
echo "stable-tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT echo ::set-output name=stable-tag::${BASH_REMATCH[1]}
else else
echo "Tag not recognised, ignoring ..." echo "Tag not recognised, ignoring ..."
fi fi
@ -633,18 +643,16 @@ jobs:
- build - build
- dev - dev
steps: steps:
- name: Install skopeo
run: sudo apt-get install -y skopeo
- name: Login to GitHub Container Registry - name: Login to GitHub Container Registry
id: ghcr-login id: ghcr-login
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
registry: ghcr.io registry: ghcr.io
username: ${{ secrets.GHCR_USERNAME }} username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }} password: ${{ secrets.GHCR_TOKEN }}
- name: Login to Docker Hub - name: Login to Docker Hub
id: docker-hub-login id: docker-hub-login
uses: docker/login-action@v2 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
@ -658,7 +666,10 @@ jobs:
run: | run: |
REPOSITORY=zmk-${TARGET}-${ARCHITECTURE} REPOSITORY=zmk-${TARGET}-${ARCHITECTURE}
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://docker.io/${DHNS}/${REPOSITORY}:stable docker pull docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE}
docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker.io/${DHNS}/${REPOSITORY}:stable
docker push docker.io/${DHNS}/${REPOSITORY}:stable
stable-git-tag: stable-git-tag:
needs: needs:
- tags - tags
@ -666,7 +677,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v2
with: with:
ref: ${{ needs.stable-release-trigger.outputs.stable-tag }} ref: ${{ needs.stable-release-trigger.outputs.stable-tag }}
- name: Tag - name: Tag

19
Dockerfile
View File

@ -23,7 +23,6 @@ RUN \
python3-pip \ python3-pip \
python3-setuptools \ python3-setuptools \
python3-wheel \ python3-wheel \
ssh \
&& pip3 install \ && pip3 install \
-r https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/v${ZEPHYR_VERSION}/scripts/requirements-base.txt \ -r https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/v${ZEPHYR_VERSION}/scripts/requirements-base.txt \
&& pip3 install cmake \ && pip3 install cmake \
@ -46,7 +45,7 @@ RUN \
apt-get -y update \ apt-get -y update \
&& apt-get -y install --no-install-recommends \ && apt-get -y install --no-install-recommends \
curl \ curl \
&& curl -sL https://deb.nodesource.com/setup_18.x | bash - \ && curl -sL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get -y update \ && apt-get -y update \
&& apt-get -y install --no-install-recommends \ && apt-get -y install --no-install-recommends \
clang-format \ clang-format \
@ -66,6 +65,7 @@ RUN \
python3-tk \ python3-tk \
python3-wheel \ python3-wheel \
socat \ socat \
ssh \
tio \ tio \
wget \ wget \
xz-utils \ xz-utils \
@ -88,21 +88,14 @@ ARG ARCHITECTURE
ARG ZEPHYR_SDK_VERSION ARG ZEPHYR_SDK_VERSION
ARG ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${ZEPHYR_SDK_VERSION} ARG ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${ZEPHYR_SDK_VERSION}
RUN \ RUN \
export minimal_sdk_file_name="zephyr-sdk-${ZEPHYR_SDK_VERSION}_linux-$(uname -m)_minimal" \ export sdk_file_name="zephyr-toolchain-${ARCHITECTURE}-${ZEPHYR_SDK_VERSION}-linux-$(uname -m)-setup.run" \
&& if [ "${ARCHITECTURE}" = "arm" ]; then arch_format="eabi"; else arch_format="elf"; fi \
&& if [ "${ARCHITECTURE#xtensa}" = "${ARCHITECTURE}" ]; then arch_sep="-"; else arch_sep="_"; fi \
&& apt-get -y update \ && apt-get -y update \
&& apt-get -y install --no-install-recommends \ && apt-get -y install --no-install-recommends \
wget \ wget \
xz-utils \ xz-utils \
&& cd ${TMP} \ && wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${sdk_file_name}" \
&& wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VERSION}/${minimal_sdk_file_name}.tar.gz" \ && sh ${sdk_file_name} --quiet -- -d ${ZEPHYR_SDK_INSTALL_DIR} \
&& tar xvfz ${minimal_sdk_file_name}.tar.gz \ && rm ${sdk_file_name} \
&& mv zephyr-sdk-${ZEPHYR_SDK_VERSION} /opt/ \
&& rm ${minimal_sdk_file_name}.tar.gz \
&& cd /opt/zephyr-sdk-${ZEPHYR_SDK_VERSION} \
&& ./setup.sh -h -c -t ${ARCHITECTURE}${arch_sep}zephyr-${arch_format} \
&& cd \
&& apt-get remove -y --purge \ && apt-get remove -y --purge \
wget \ wget \
xz-utils \ xz-utils \

19
architectures.yml
View File

@ -1,18 +1,15 @@
- arc - arc
- arc64
- arm - arm
- aarch64 - arm64
- mips - mips
- nios2 - nios2
- riscv64 - riscv64
- sparc - sparc
- x86_64 - x86_64
- xtensa-espressif_esp32 - xtensa_intel_apl_adsp
- xtensa-espressif_esp32s2 - xtensa_intel_bdw_adsp
- xtensa-intel_apl_adsp - xtensa_intel_byt_adsp
- xtensa-intel_bdw_adsp - xtensa_intel_s1000
- xtensa-intel_byt_adsp - xtensa_nxp_imx8m_adsp
- xtensa-intel_s1000 - xtensa_nxp_imx_adsp
- xtensa-nxp_imx8m_adsp - xtensa_sample_controller
- xtensa-nxp_imx_adsp
- xtensa-sample_controller