diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b61edc96..47e3c15d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -22,7 +22,7 @@ jobs: - name: Get Version run: | - echo VERSION=$(cat share/const.go |grep 'const VERSION' | awk '{print $4}' | sed "s/\"//g") >> $GITHUB_ENV + echo VERSION=$(cat share/const.go |grep 'const VERSION' | awk '{print $4}' | sed "s/\"//g")-dev >> $GITHUB_ENV - name: Check Version run: echo $VERSION diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml index cc0a6543..acfdc1ee 100644 --- a/.github/workflows/release-linux.yml +++ b/.github/workflows/release-linux.yml @@ -6,7 +6,7 @@ on: tags: description: "Version tags" push: - branches: [main] + branches: [v0.10.3-dev] paths: - "share/const.go" @@ -108,6 +108,8 @@ jobs: - name: Checkout Code uses: actions/checkout@v2 + with: + ref: v0.10.3-dev - name: Setup Go ${{ matrix.go }} uses: actions/setup-go@v3 diff --git a/.github/workflows/release-macos.yml b/.github/workflows/release-macos.yml index d6bdda4c..c1e39ae4 100644 --- a/.github/workflows/release-macos.yml +++ b/.github/workflows/release-macos.yml @@ -6,7 +6,7 @@ on: tags: description: "Version tags" push: - branches: [main] + branches: [v0.10.3-dev] paths: - "share/const.go" @@ -105,6 +105,8 @@ jobs: - name: Checkout Code uses: actions/checkout@v2 + with: + ref: v0.10.3-dev - name: Setup Go ${{ matrix.go }} uses: actions/setup-go@v3 diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index bb9ad54f..50dba61a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -4,9 +4,9 @@ on: workflow_dispatch: inputs: tags: - description: "Comment" + description: "Version" push: - branches: [main] + branches: [v0.10.3-dev] env: YAO_DEV: ${{ github.WORKSPACE }} @@ -133,6 +133,8 @@ jobs: - name: Checkout Code uses: actions/checkout@v3 + with: + ref: v0.10.3-dev - name: Start Redis uses: supercharge/redis-github-action@1.4.0 diff --git a/Makefile b/Makefile index deaf9264..7e368c12 100644 --- a/Makefile +++ b/Makefile @@ -174,7 +174,7 @@ artifacts-linux: clean mv dist/yao-*-* dist/release/ chmod +x dist/release/yao-*-* ls -l dist/release/ - dist/release/yao-${VERSION}-linux-amd64 version + dist/release/yao-${VERSION}-dev-linux-amd64 version # Reset const # cp -f share/const.goe share/const.go @@ -224,7 +224,7 @@ artifacts-macos: clean mv dist/yao-*-* dist/release/ chmod +x dist/release/yao-*-* ls -l dist/release/ - dist/release/yao-${VERSION}-darwin-amd64 version + dist/release/yao-${VERSION}-dev-darwin-amd64 version # Reset const # cp -f share/const.goe share/const.go diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 37498434..18f85cb8 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -20,7 +20,7 @@ ARG ARCH RUN groupadd -r yao && useradd -r -g yao yao && \ apt-get update && \ apt-get install -y curl sudo procps net-tools -RUN curl -fsSL "https://release-sv-1252011659.cos.na-siliconvalley.myqcloud.com/archives/yao-${VERSION}-linux-${ARCH}" > /usr/local/bin/yao && \ +RUN curl -fsSL "https://release-sv-1252011659.cos.na-siliconvalley.myqcloud.com/archives/yao-${VERSION}-dev-linux-${ARCH}" > /usr/local/bin/yao && \ chmod +x /usr/local/bin/yao && \ mkdir -p /data/app diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index 5339f235..17cb1176 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -18,7 +18,7 @@ FROM alpine:latest ARG VERSION ARG ARCH RUN apk --no-cache add curl -RUN curl -fsSL "https://release-sv-1252011659.cos.na-siliconvalley.myqcloud.com/archives/yao-${VERSION}-linux-${ARCH}" > /usr/local/bin/yao && \ +RUN curl -fsSL "https://release-sv-1252011659.cos.na-siliconvalley.myqcloud.com/archives/yao-${VERSION}-dev-linux-${ARCH}" > /usr/local/bin/yao && \ chmod +x /usr/local/bin/yao RUN mkdir -p /data/app VOLUME /data/app