From 232e0eed8e987ce0bb01c3362fdfc65ac2ca97ed Mon Sep 17 00:00:00 2001 From: Kroese Date: Fri, 21 Apr 2023 12:52:04 +0200 Subject: [PATCH] Update build.yml --- .github/workflows/build.yml | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fef736a..8de1e84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,10 +11,10 @@ on: - '.github/workflows/**' jobs: - check: + shellcheck: uses: ./.github/workflows/check.yml build: - needs: check + needs: shellcheck runs-on: ubuntu-latest permissions: packages: write @@ -23,7 +23,18 @@ jobs: - uses: actions/checkout@v3 - name: Build the Docker image - run: docker build . --file Dockerfile --build-arg "VERSION_ARG=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" --build-arg "BUILD_ARG=${GITHUB_RUN_ID}" --label "id=${GITHUB_RUN_ID}" --label "version=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" --tag "${{ github.repository }}:latest" --tag "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" --tag "ghcr.io/${{ github.repository }}:latest" --tag "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" + run: | + docker build . \ + --file Dockerfile \ + --build-arg "VERSION_ARG=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" \ + --build-arg "BUILD_ARG=${GITHUB_RUN_ID}" \ + --build-arg "DATE_ARG=${{ github.event.repository.updated_at }}" \ + --label "build=${GITHUB_RUN_ID}" \ + --label "version=${{ secrets.MAJOR }}.${{ secrets.MINOR }}" \ + --tag "${{ github.repository }}:latest" \ + --tag "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" \ + --tag "ghcr.io/${{ github.repository }}:latest" \ + --tag "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" - name: Update Minor version uses: hmanzur/actions-set-secret@v2.0.0 @@ -32,6 +43,14 @@ jobs: value: $((${{ secrets.MINOR }}+1)) repository: ${{ github.repository }} token: ${{ secrets.REPO_ACCESS_TOKEN }} + - + name: Create tag + uses: rickstaa/action-create-tag@v1 + id: "tag_create" + with: + tag: "v${{ secrets.MAJOR }}.${{ secrets.MINOR }}" + tag_exists_error: false + message: "Release v${{ secrets.MAJOR }}.${{ secrets.MINOR }}" - name: Login to Docker Hub uses: docker/login-action@v2 @@ -40,7 +59,9 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Push to DockerHub - run: docker push "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" && docker push "${{ github.repository }}:latest" + run: | + docker push "${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" &&\ + docker push "${{ github.repository }}:latest" - name: Login to GitHub Container Registry uses: docker/login-action@v2 @@ -50,7 +71,9 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Push to Github Container Registry - run: docker push "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" && docker push "ghcr.io/${{ github.repository }}:latest" + run: | + docker push "ghcr.io/${{ github.repository }}:${{ secrets.MAJOR }}.${{ secrets.MINOR }}" && \ + docker push "ghcr.io/${{ github.repository }}:latest" mirror: runs-on: ubuntu-latest permissions: @@ -64,5 +87,5 @@ jobs: uses: wangchucheng/git-repo-sync@v0.1.0 with: target-url: ${{ secrets.GITLAB_URL }} - target-username: ${{ secrets.GITLAB_USERNAME }} target-token: ${{ secrets.GITLAB_TOKEN }} + target-username: ${{ secrets.GITLAB_USERNAME }}