From f695864fd800b89568605106e9903bf1c2d3f43d Mon Sep 17 00:00:00 2001 From: whyour Date: Sat, 27 Nov 2021 17:12:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbuild=20args?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build_docker_image.yml | 4 +- .github/workflows/test.yml | 55 ------------------------ 2 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/build_docker_image.yml b/.github/workflows/build_docker_image.yml index 9066795b..7e593d8e 100644 --- a/.github/workflows/build_docker_image.yml +++ b/.github/workflows/build_docker_image.yml @@ -105,7 +105,9 @@ jobs: id: docker_build uses: docker/build-push-action@v2 with: - build-args: MAINTAINER=${{ github.repository_owner }}, QL_BRANCH=${{ github.ref_name }} + build-args: | + MAINTAINER=${{ github.repository_owner }} + QL_BRANCH=${{ github.ref_name }} platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x context: docker/ push: true diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index aab68da2..00000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: test - -on: - push: - branches: - - 'master' - - 'develop' - # Sequence of patterns matched against refs/tags - tags: - - 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10 - -jobs: - build-static: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: '14' - - - name: build front and back - run: | - yarn install - yarn build - yarn build-back - - - name: copy to static repo - env: - GITHUB_REPO: github.com/${{ github.repository_owner }}/qinglong-static - GITHUB_BRANCH: ${{ github.ref_name }} - run: | - echo ${{ github.ref_name }} - build: - needs: build-static - - runs-on: ubuntu-latest - - permissions: - packages: write - contents: read - - steps: - - uses: actions/checkout@v2 - - - name: Set time zone - uses: szenius/set-timezone@v1.0 - with: - timezoneLinux: "Asia/Shanghai" - timezoneMacos: "Asia/Shanghai" - timezoneWindows: "China Standard Time" - - - name: test - run: | - echo ${{ github.ref_name }} -