diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml index 5bb49e91b..2932c60b1 100644 --- a/.github/workflows/mirror.yml +++ b/.github/workflows/mirror.yml @@ -2,9 +2,12 @@ name: Mirror Repository on: workflow_dispatch: - workflow_call: push: +concurrency: + group: mirror-repository + cancel-in-progress: true + jobs: mirror: strategy: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dcaac40ae..6a869921e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -97,27 +97,29 @@ jobs: run: go install "cnb.cool/looc/git-cnb@$GIT_CNB_VERSION" env: GIT_CNB_VERSION: '1.1.2' - - name: Update mirror repositories - if: ${{ env.continue == 'true' }} - uses: ./.github/workflows/mirror.yml - name: Create CNB release if: ${{ env.continue == 'true' }} run: | + echo "Uploading tags to CNB" + git fetch --tags + git push "https://cnb:${{ secrets.CNB_SYNC_TOKEN }}@cnb.cool/$CNB_REPO.git" "$HMCL_TAG_NAME" + + echo "Creating CNB release" ~/go/bin/git-cnb release create \ --repo "$CNB_REPO" \ - --tag "v$HMCL_VERSION" \ + --tag "$HMCL_TAG_NAME" \ --name "HMCL $HMCL_VERSION" \ --body "$(cat CNB_RELEASE_NOTE)" \ --prerelease true echo "Uploading HMCL-$HMCL_VERSION.jar" - ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "v$HMCL_VERSION" --file-name "HMCL-$HMCL_VERSION.jar" + ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.jar" echo "Uploading HMCL-$HMCL_VERSION.exe" - ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "v$HMCL_VERSION" --file-name "HMCL-$HMCL_VERSION.exe" + ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.exe" echo "Uploading HMCL-$HMCL_VERSION.sh" - ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "v$HMCL_VERSION" --file-name "HMCL-$HMCL_VERSION.sh" + ~/go/bin/git-cnb release asset-upload --repo="$CNB_REPO" --tag-name "$HMCL_TAG_NAME" --file-name "HMCL-$HMCL_VERSION.sh" env: CNB_TOKEN: ${{ secrets.CNB_SYNC_TOKEN }} CNB_REPO: HMCL-dev/HMCL