Merge branch '3.0-branch' into 3.2-branch
* Bring in Node version bump, deps bumps, etc.
This commit is contained in:
Peter Johanson
commit
2eba1525f4
68
.github/workflows/containers.yml
vendored
68
.github/workflows/containers.yml
vendored
@ -97,14 +97,14 @@ jobs:
|
||||
- name: Login to Docker Hub
|
||||
id: docker-hub-login
|
||||
if: ${{ env.docker-hub-credentials == 'true' }}
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
- name: Login to GitHub Container Registry
|
||||
id: ghcr-login
|
||||
if: ${{ env.ghcr-credentials == 'true' }}
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ secrets.GHCR_USERNAME }}
|
||||
@ -130,7 +130,7 @@ jobs:
|
||||
echo ::set-output name=major-minor-branch-upstream::docker.io/${NSU}/${REPOSITORY}:${MAJOR_MINOR_BRANCH}
|
||||
- name: Set up cache
|
||||
id: cache
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
env:
|
||||
cache-name: dev-generic
|
||||
with:
|
||||
@ -139,11 +139,11 @@ jobs:
|
||||
restore-keys: |
|
||||
${{ runner.os }}/${{ env.cache-name }}/${{ github.run_id }}
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
uses: docker/setup-qemu-action@v2
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
- name: Build to local cache
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
target: dev-generic
|
||||
platforms: linux/amd64,linux/arm64
|
||||
@ -160,7 +160,7 @@ jobs:
|
||||
cache-to: type=local,dest=${{ steps.paths.outputs.local-new }},mode=max
|
||||
- name: Push to registry cache
|
||||
if: ${{ env.docker-hub-credentials == 'true' }}
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
target: dev-generic
|
||||
platforms: linux/amd64,linux/arm64
|
||||
@ -203,14 +203,14 @@ jobs:
|
||||
- name: Login to Docker Hub
|
||||
id: docker-hub-login
|
||||
if: ${{ env.docker-hub-credentials == 'true' }}
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
- name: Login to GitHub Container Registry
|
||||
id: ghcr-login
|
||||
if: ${{ env.ghcr-credentials == 'true' }}
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ secrets.GHCR_USERNAME }}
|
||||
@ -282,18 +282,18 @@ jobs:
|
||||
echo ::set-output name=list::${LIST}
|
||||
- name: Set up dev-generic cache
|
||||
id: dev-generic-cache
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
env:
|
||||
cache-name: dev-generic
|
||||
with:
|
||||
path: ${{ steps.paths.outputs.dev-generic }}
|
||||
key: ${{ runner.os }}/${{ env.cache-name }}/${{ github.run_id }}/${{ needs.timestamp.outputs.timestamp }}
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v1
|
||||
uses: docker/setup-qemu-action@v2
|
||||
- name: Set up Docker Buildx
|
||||
uses: docker/setup-buildx-action@v1
|
||||
uses: docker/setup-buildx-action@v2
|
||||
- name: Build and load 'build' candidate image
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
target: build
|
||||
build-args: |
|
||||
@ -314,7 +314,7 @@ jobs:
|
||||
cache-to: type=inline
|
||||
load: true
|
||||
- name: Build and load 'dev' candidate image
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
target: dev
|
||||
build-args: |
|
||||
@ -341,7 +341,7 @@ jobs:
|
||||
repository: ${{ env.zmk-repository }}
|
||||
ref: ${{ env.zmk-ref }}
|
||||
- name: Cache Zephyr modules
|
||||
uses: actions/cache@v2
|
||||
uses: actions/cache@v3
|
||||
env:
|
||||
cache-name: zephyr-modules
|
||||
with:
|
||||
@ -437,7 +437,7 @@ jobs:
|
||||
run: docker stop candidate
|
||||
- name: Build and push 'build' candidate image (x86_64 and arm64)
|
||||
if: ${{ steps.docker-hub-login.outcome == 'success' }}
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
target: build
|
||||
platforms: linux/amd64,linux/arm64
|
||||
@ -460,7 +460,7 @@ jobs:
|
||||
push: true
|
||||
- name: Build and push 'dev' candidate image (x86_64 + arm64)
|
||||
if: ${{ steps.docker-hub-login.outcome == 'success' }}
|
||||
uses: docker/build-push-action@v2
|
||||
uses: docker/build-push-action@v3
|
||||
with:
|
||||
target: dev
|
||||
platforms: linux/amd64,linux/arm64
|
||||
@ -560,16 +560,18 @@ jobs:
|
||||
- build
|
||||
- dev
|
||||
steps:
|
||||
- name: Install skopeo
|
||||
run: sudo apt-get install -y skopeo
|
||||
- name: Login to GitHub Container Registry
|
||||
id: ghcr-login
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ secrets.GHCR_USERNAME }}
|
||||
password: ${{ secrets.GHCR_TOKEN }}
|
||||
- name: Login to Docker Hub
|
||||
id: docker-hub-login
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
@ -585,18 +587,11 @@ jobs:
|
||||
run: |
|
||||
REPOSITORY=zmk-${TARGET}-${ARCHITECTURE}
|
||||
|
||||
docker pull docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE}
|
||||
docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker.io/${DHNS}/${REPOSITORY}:${VERSIONS}
|
||||
docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker.io/${DHNS}/${REPOSITORY}:${MAJOR_MINOR}
|
||||
docker tag docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} ghcr.io/${GHCRNS}/${REPOSITORY}:${CANDIDATE}
|
||||
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}
|
||||
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://docker.io/${DHNS}/${REPOSITORY}:${VERSIONS}
|
||||
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://docker.io/${DHNS}/${REPOSITORY}:${MAJOR_MINOR}
|
||||
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://ghcr.io/${GHCRNS}/${REPOSITORY}:${CANDIDATE}
|
||||
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://ghcr.io/${GHCRNS}/${REPOSITORY}:${VERSIONS}
|
||||
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://ghcr.io/${GHCRNS}/${REPOSITORY}:${MAJOR_MINOR}
|
||||
git-tag:
|
||||
needs:
|
||||
- tags
|
||||
@ -643,16 +638,18 @@ jobs:
|
||||
- build
|
||||
- dev
|
||||
steps:
|
||||
- name: Install skopeo
|
||||
run: sudo apt-get install -y skopeo
|
||||
- name: Login to GitHub Container Registry
|
||||
id: ghcr-login
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
registry: ghcr.io
|
||||
username: ${{ secrets.GHCR_USERNAME }}
|
||||
password: ${{ secrets.GHCR_TOKEN }}
|
||||
- name: Login to Docker Hub
|
||||
id: docker-hub-login
|
||||
uses: docker/login-action@v1
|
||||
uses: docker/login-action@v2
|
||||
with:
|
||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
@ -666,10 +663,7 @@ jobs:
|
||||
run: |
|
||||
REPOSITORY=zmk-${TARGET}-${ARCHITECTURE}
|
||||
|
||||
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
|
||||
skopeo copy --all docker://docker.io/${DHNS}/${REPOSITORY}:${CANDIDATE} docker://docker.io/${DHNS}/${REPOSITORY}:stable
|
||||
stable-git-tag:
|
||||
needs:
|
||||
- tags
|
||||
|
||||
@ -45,7 +45,7 @@ RUN \
|
||||
apt-get -y update \
|
||||
&& apt-get -y install --no-install-recommends \
|
||||
curl \
|
||||
&& curl -sL https://deb.nodesource.com/setup_16.x | bash - \
|
||||
&& curl -sL https://deb.nodesource.com/setup_18.x | bash - \
|
||||
&& apt-get -y update \
|
||||
&& apt-get -y install --no-install-recommends \
|
||||
clang-format \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user