mirror of
https://gitclone.com/github.com/MetaCubeX/Clash.Meta
synced 2024-11-15 05:31:18 +08:00
Merge remote-tracking branch 'Meta/Alpha' into Alpha
# Conflicts: # .github/workflows/prerelease.yml # .github/workflows/release.yaml
This commit is contained in:
commit
5f957b5cf9
4
.github/workflows/docker.yaml
vendored
4
.github/workflows/docker.yaml
vendored
@ -41,8 +41,8 @@ jobs:
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
registry: ${{ env.REGISTRY }}
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
username: ${{ secrets.DOCKER_HUB_USER }}
|
||||
password: ${{ secrets.DOCKER_HUB_TOKEN }}
|
||||
|
||||
# Build and push Docker image with Buildx (don't push on PR)
|
||||
# https://github.com/docker/build-push-action
|
||||
|
11
.github/workflows/prerelease.yml
vendored
11
.github/workflows/prerelease.yml
vendored
@ -1,4 +1,4 @@
|
||||
name: prerelease
|
||||
name: Prerelease
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
@ -31,10 +31,13 @@ jobs:
|
||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-go-
|
||||
|
||||
|
||||
- name: Test
|
||||
if: ${{env.GITHUB_REF_NAME=='Beta'}}
|
||||
run: |
|
||||
go test ./...
|
||||
|
||||
- name: Build
|
||||
if: success()
|
||||
env:
|
||||
@ -46,13 +49,13 @@ jobs:
|
||||
uses: andreaswilli/delete-release-assets-action@v2.0.0
|
||||
with:
|
||||
github_token: ${{ secrets.GITHUB_TOKEN }}
|
||||
tag: ${{ env.GITHUB_REF_NAME }}
|
||||
tag: Prerelease-${{env.GITHUB_REF_NAME}}
|
||||
deleteOnlyFromDrafts: false
|
||||
|
||||
- name: Tag Repo
|
||||
uses: richardsimko/update-tag@v1
|
||||
with:
|
||||
tag_name: ${{env.GITHUB_REF_NAME}}
|
||||
tag_name: Prerelease-${{env.GITHUB_REF_NAME}}
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
|
||||
@ -61,7 +64,7 @@ jobs:
|
||||
if: ${{ success() }}
|
||||
with:
|
||||
tag: ${{env.GITHUB_REF_NAME}}
|
||||
tag_name: ${{env.GITHUB_REF_NAME}}
|
||||
tag_name: Prerelease-${{env.GITHUB_REF_NAME}}
|
||||
files: bin/*
|
||||
prerelease: true
|
||||
generate_release_notes: true
|
||||
|
2
.github/workflows/release.yaml
vendored
2
.github/workflows/release.yaml
vendored
@ -1,4 +1,4 @@
|
||||
name: release
|
||||
name: Release
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
|
Loading…
Reference in New Issue
Block a user