Merge remote-tracking branch 'Meta/Alpha' into Alpha

# Conflicts:
#	.github/workflows/prerelease.yml
#	.github/workflows/release.yaml
This commit is contained in:
MetaCubeX 2022-05-02 05:01:33 +08:00
commit 5f957b5cf9
3 changed files with 10 additions and 7 deletions

View File

@ -41,8 +41,8 @@ jobs:
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# Build and push Docker image with Buildx (don't push on PR) # Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action # https://github.com/docker/build-push-action

View File

@ -1,4 +1,4 @@
name: prerelease name: Prerelease
on: on:
push: push:
branches: branches:
@ -31,10 +31,13 @@ jobs:
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: | restore-keys: |
${{ runner.os }}-go- ${{ runner.os }}-go-
- name: Test - name: Test
if: ${{env.GITHUB_REF_NAME=='Beta'}} if: ${{env.GITHUB_REF_NAME=='Beta'}}
run: | run: |
go test ./... go test ./...
- name: Build - name: Build
if: success() if: success()
env: env:
@ -46,13 +49,13 @@ jobs:
uses: andreaswilli/delete-release-assets-action@v2.0.0 uses: andreaswilli/delete-release-assets-action@v2.0.0
with: with:
github_token: ${{ secrets.GITHUB_TOKEN }} github_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ env.GITHUB_REF_NAME }} tag: Prerelease-${{env.GITHUB_REF_NAME}}
deleteOnlyFromDrafts: false deleteOnlyFromDrafts: false
- name: Tag Repo - name: Tag Repo
uses: richardsimko/update-tag@v1 uses: richardsimko/update-tag@v1
with: with:
tag_name: ${{env.GITHUB_REF_NAME}} tag_name: Prerelease-${{env.GITHUB_REF_NAME}}
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@ -61,7 +64,7 @@ jobs:
if: ${{ success() }} if: ${{ success() }}
with: with:
tag: ${{env.GITHUB_REF_NAME}} tag: ${{env.GITHUB_REF_NAME}}
tag_name: ${{env.GITHUB_REF_NAME}} tag_name: Prerelease-${{env.GITHUB_REF_NAME}}
files: bin/* files: bin/*
prerelease: true prerelease: true
generate_release_notes: true generate_release_notes: true

View File

@ -1,4 +1,4 @@
name: release name: Release
on: on:
push: push:
tags: tags: