From 2760438c1b3ed3955f4e686ed0f1f0ff932b38d9 Mon Sep 17 00:00:00 2001 From: dec0dOS Date: Sat, 15 May 2021 16:53:39 +0300 Subject: [PATCH] ci: add ARM64 build --- .github/workflows/main.yml | 13 +++++++++---- CHANGELOG.md | 2 -- package.json | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6888f1c..804d716 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,10 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v1 + - name: Prepare zero-ui id: prep_zero-ui run: | @@ -28,9 +32,6 @@ jobs: TAGS="$TAGS,${DOCKER_IMAGE}:latest" fi echo ::set-output name=tags::${TAGS} - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v1 - name: Cache Docker layers uses: actions/cache@v2 @@ -39,7 +40,9 @@ jobs: key: ${{ runner.os }}-buildx-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx- - - uses: docker/login-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} @@ -51,6 +54,7 @@ jobs: context: ./ file: ./docker/zero-ui/Dockerfile builder: ${{ steps.buildx.outputs.name }} + platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.prep_zero-ui.outputs.tags }} cache-from: type=local,src=/tmp/.buildx-cache @@ -63,6 +67,7 @@ jobs: context: ./ file: ./docker/zerotier/Dockerfile builder: ${{ steps.buildx.outputs.name }} + platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ secrets.DOCKER_HUB_USERNAME }}/zerotier-controller:latest cache-from: type=local,src=/tmp/.buildx-cache diff --git a/CHANGELOG.md b/CHANGELOG.md index 22a6f8c..5918ff8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,6 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. -### [1.0.7](https://github.com/dec0dOS/zero-ui/compare/v1.0.6...v1.0.7) (2021-05-15) - ### [1.0.6](https://github.com/dec0dOS/zero-ui/compare/v1.0.5...v1.0.6) (2021-05-15) ### [1.0.5](https://github.com/dec0dOS/zero-ui/compare/v1.0.4...v1.0.5) (2021-04-16) diff --git a/package.json b/package.json index 2faf2a7..a6f0bbd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zero-ui", - "version": "1.0.7", + "version": "1.0.6", "private": "true", "scripts": { "postinstall": "husky install",