action file merge

king-usr · Mar 26, 2020 · c16fee3 · c16fee3
1 parent fdc36ee
commit c16fee3
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 71 deletions.
diff --git a/.github/workflows/docker-latest.yml b/.github/workflows/docker-latest.yml
diff --git a/.github/workflows/docker-tag.yml b/.github/workflows/docker-tag.yml
@@ -27,7 +27,21 @@ jobs:
                 go-version: 1.14.x
 
         -
-            name: Checkout and crossbuild
+            name: Dockerhub login
+            env:
+                DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+                DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+            run: |
+                echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
+
+        -
+            name: Set up Docker Buildx
+            id: buildx
+            uses: crazy-max/ghaction-docker-buildx@v1
+            with:
+                version: latest
+        -
+            name: Checkout and crossbuild v2fly:tag
             run: |
                REPO=$(pwd)
                export GOPATH=$REPO/go
@@ -40,26 +54,37 @@ jobs:
                bash $REPO/ci-package.sh nosource noconf codename=${GITTAG} buildname=dockerfly-armv7 arm7 abpathtgz=$REPO/v2ray-armv7.tgz 
 
         -
-            name: Dockerhub login
+            name: Build v2fly-tag (with docker push)
             env:
-                DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
                 DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
             run: |
-                echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
+                docker buildx build \
+                --platform=linux/amd64,linux/arm/v7,linux/arm64 \
+                --output "type=image,push=true" \
+                --file ./Dockerfile.X . \
+                --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/v2fly-core:${GITTAG}
         -
-            name: Set up Docker Buildx
-            id: buildx
-            uses: crazy-max/ghaction-docker-buildx@v1
-            with:
-                version: latest
+            name: Checkout and crossbuild v2fly:latest
+            run: |
+               REPO=$(pwd)
+               rm -fv $(REPO)/v2ray-*.tgz
+               export GOPATH=$REPO/go
+               pushd $GOPATH/src/v2ray.com/core
+               git fetch
+               git checkout -b release_latest master
+               HASH=$(git rev-parse --short HEAD)
+               bash $REPO/ci-package.sh nosource noconf codename=v2fly-${HASH} buildname=dockerfly-amd64 abpathtgz=$REPO/v2ray-amd64.tgz 
+               bash $REPO/ci-package.sh nosource noconf codename=v2fly-${HASH} buildname=dockerfly-arm64 arm64 abpathtgz=$REPO/v2ray-arm64.tgz 
+               bash $REPO/ci-package.sh nosource noconf codename=v2fly-${HASH} buildname=dockerfly-armv7 arm7 abpathtgz=$REPO/v2ray-armv7.tgz 
+
         -
-            name: Build dockerfile (with push)
+            name: Build v2fly:latest (with docker push)
             env:
                 DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
             run: |
                 docker buildx build \
                 --platform=linux/amd64,linux/arm/v7,linux/arm64 \
                 --output "type=image,push=true" \
                 --file ./Dockerfile.X . \
-                --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/v2fly-core:${GITTAG}
+                --tag $(echo "${DOCKER_USERNAME}" | tr '[:upper:]' '[:lower:]')/v2fly-core:latest