package/tun2socks
1
0
Fork 0
mirror of https://github.com/xjasonlyu/tun2socks.git synced 2025-10-12 20:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

adjust actions

Browse Source
This commit is contained in:
xjasonlyu
2020-11-08 12:00:41 +08:00
parent 8c7075050c
commit 3b641119db
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/docker.yml vendored
View File

@@ -38,12 +38,23 @@ jobs:
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }} password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build and Push (dev)
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v2
with:
context: .
push: true
platforms: linux/amd64,linux/arm64
tags: |
xjasonlyu/tun2socks:dev
- name: Get Version - name: Get Version
id: shell id: shell
run: | run: |
echo ::set-output name=version::$(git describe --tags --abbrev=0) echo ::set-output name=version::$(git describe --tags --abbrev=0)
- name: Build and Push - name: Build and Push (latest)
if: startsWith(github.ref, 'refs/tags/')
uses: docker/build-push-action@v2 uses: docker/build-push-action@v2
with: with:
context: . context: .

3
.github/workflows/go.yml vendored
View File

@@ -45,9 +45,6 @@ jobs:
- name: Build - name: Build
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
env:
DIR: bin
NAME: tun2socks
run: make -j releases run: make -j releases
- name: Upload Release - name: Upload Release

2
Makefile
View File

@@ -4,7 +4,7 @@ NAME = "tun2socks"
TAGS = "" TAGS = ""
BUILD_FLAGS = "-v" BUILD_FLAGS = "-v"
VERSION = $(shell git describe --tags --abbrev=0 || echo "unknown version") VERSION = $(shell git describe --tags || echo "unknown version")
BUILD_TIME = $(shell date -u '+%FT%TZ') BUILD_TIME = $(shell date -u '+%FT%TZ')
LDFLAGS += -w -s -buildid= LDFLAGS += -w -s -buildid=