ngbs 4 years ago
parent
commit
d26a8a5ad8
1 changed files with 56 additions and 55 deletions
  1. 56 55
      .github/workflows/main.yml

+ 56 - 55
.github/workflows/main.yml

@@ -886,68 +886,68 @@ jobs:
           echo ${{ steps.docker_build_kcptun_server.outputs.digest }}
           echo ${{ steps.docker_build_kcptun_client.outputs.digest }}
 
-  build-trojan-go:
-    needs: build-basic
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check Out Repo
-        uses: actions/checkout@v2
+  # build-trojan-go:
+  #   needs: build-basic
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Check Out Repo
+  #       uses: actions/checkout@v2
 
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v1
+  #     - name: Set up Docker Buildx
+  #       id: buildx
+  #       uses: docker/setup-buildx-action@v1
 
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+  #     - name: Cache Docker layers
+  #       uses: actions/cache@v2
+  #       with:
+  #         path: /tmp/.buildx-cache
+  #         key: ${{ runner.os }}-buildx-${{ github.sha }}
+  #         restore-keys: |
+  #           ${{ runner.os }}-buildx-
 
-      - name: Login to Docker Hub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+  #     - name: Login to Docker Hub
+  #       uses: docker/login-action@v1
+  #       with:
+  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
+  #         password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
 
-      - name: Build trojan-go-server and push
-        id: docker_build_trojan_go_server
-        uses: docker/build-push-action@v2
-        with:
-          context: ./trojan-go
-          file: ./trojan-go/Dockerfile.server
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-server:latest
-            ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-server:0.10.4
-          builder: ${{ steps.buildx.outputs.name }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+  #     - name: Build trojan-go-server and push
+  #       id: docker_build_trojan_go_server
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         context: ./trojan-go
+  #         file: ./trojan-go/Dockerfile.server
+  #         push: true
+  #         tags: |
+  #           ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-server:latest
+  #           ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-server:0.10.4
+  #         builder: ${{ steps.buildx.outputs.name }}
+  #         cache-from: type=local,src=/tmp/.buildx-cache
+  #         cache-to: type=local,dest=/tmp/.buildx-cache-new
 
-      - name: Build trojan-go-client and push
-        id: docker_build_trojan_go_client
-        uses: docker/build-push-action@v2
-        with:
-          context: ./trojan-go
-          file: ./trojan-go/Dockerfile.client
-          push: true
-          tags: |
-            ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-client:latest
-            ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-client:0.10.4
-          builder: ${{ steps.buildx.outputs.name }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new
+  #     - name: Build trojan-go-client and push
+  #       id: docker_build_trojan_go_client
+  #       uses: docker/build-push-action@v2
+  #       with:
+  #         context: ./trojan-go
+  #         file: ./trojan-go/Dockerfile.client
+  #         push: true
+  #         tags: |
+  #           ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-client:latest
+  #           ${{ secrets.DOCKER_HUB_USERNAME }}/trojan-go-client:0.10.4
+  #         builder: ${{ steps.buildx.outputs.name }}
+  #         cache-from: type=local,src=/tmp/.buildx-cache
+  #         cache-to: type=local,dest=/tmp/.buildx-cache-new
 
-      - name: Move cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+  #     - name: Move cache
+  #       run: |
+  #         rm -rf /tmp/.buildx-cache
+  #         mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
-      - name: Image digest
-        run: |
-          echo ${{ steps.docker_build_trojan_go_server.outputs.digest }}
-          echo ${{ steps.docker_build_trojan_go_client.outputs.digest }}
+  #     - name: Image digest
+  #       run: |
+  #         echo ${{ steps.docker_build_trojan_go_server.outputs.digest }}
+  #         echo ${{ steps.docker_build_trojan_go_client.outputs.digest }}
 
   # build-encrypted-dns:
   #   needs: build-basic
@@ -998,6 +998,7 @@ jobs:
   #         echo ${{ steps.docker_build_encrypted_dns.outputs.digest }}
 
   deploy:
+    needs: [build-chinadns-ng, build-dnscrypt-proxy, build-doh-server, build-xray, build-v2ray, build-naiveproxy, build-syncthing, build-kms, build-lego, build-traefik, build-samba, build-caddy, build-udp2raw, build-tinyfec, build-frp, build-kcptun]
     runs-on: ubuntu-latest
 
     steps: