Deployer

.github/workflows/auto-release.yml

@@ -24,33 +24,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
+          VERBOSE: true
           DEFAULT_BUMP: "patch"
-
-  sync_docs:
-    if: github.ref == 'refs/heads/master'
-    needs: release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout flyctl
-        uses: actions/checkout@v4
-      - uses: jnwng/github-app-installation-token-action@778da2ab509f3ef5e4b902bc15daf25ef3e34939
-        id: installationToken
-        with:
-          appId: 339363
-          installationId: 37947271
-          privateKey: ${{ secrets.DOCS_SYNCER_GITHUB_APP_PRIVATE_KEY }}
-      - name: Checkout docs
-        uses: actions/checkout@v4
-        with:
-          repository: superfly/docs
-          token: ${{ steps.installationToken.outputs.token }}
-          path: docs
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: "go.mod"
-          check-latest: true
-      - name: Publish CLI docs
-        id: publish-cli-docs
-        env:
-          GITHUB_TOKEN: ${{ steps.installationToken.outputs.token }}
-        run: scripts/publish_docs.sh ${{ github.ref_name }}
+          GIT_API_TAGGING: false

.github/workflows/build.yml

@@ -39,3 +39,8 @@ jobs:
     needs: test_build
     uses: ./.github/workflows/preflight.yml
     secrets: inherit
+
+  # deployer-tests:
+  #   needs: test_build
+  #   uses: ./.github/workflows/deployer-tests.yml
+  #   secrets: inherit

.github/workflows/checks.yml

@@ -34,17 +34,13 @@ jobs:
           extra_args: --all-files --hook-stage=manual
 
   lint:
-    strategy:
-      fail-fast: false
     name: lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
-          # check-latest: true
-      - uses: golangci/golangci-lint-action@v6
+      - uses: golangci/golangci-lint-action@v8
         with:
-          version: v1.61.0
-          working-directory: .
+          version: v2.4.0

.github/workflows/preflight_gpu.yml → .github/workflows/deployer-tests.yml

@@ -1,58 +1,61 @@
-name: Preflight GPU Tests
-
+name: Deployer tests
 on:
-  schedule:
-    - cron: "30 0 * * *"
-  workflow_dispatch:
-    inputs:
-      reason:
-        description: Brief reason for running this workflow manually
-        required: false
-        default: User initiated run
-        type: string
-  workflow_call:
+  push:
 
 jobs:
-  build:
-    runs-on: ubuntu-latest-m
+  build-deployer:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
+
       - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
           check-latest: true
-      - name: "Place wintun.dll"
-        run: cp deps/wintun/bin/amd64/wintun.dll ./
-      - name: build
-        uses: goreleaser/goreleaser-action@v5
-        env:
-          BUILD_ENV: "development"
+      - name: "Build flyctl"
+        run: make build
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          version: latest
-          args: build --clean --snapshot --verbose
-      - name: Upload flyctl for preflight
+          registry: https://index.docker.io/v1/
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Upload flyctl for the deployer tests
         uses: actions/upload-artifact@v4
         with:
-          name: flyctl
-          path: dist/default_linux_amd64_v1/flyctl
+          name: deployer-flyctl
+          path: bin/flyctl
           overwrite: true
 
-  preflight-gpu-tests:
-    needs: build
-    if: ${{ github.repository == 'superfly/flyctl' }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          context: .
+          file: deployer.Dockerfile
+          tags: flyio/deployer:${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  deployer-tests:
+    needs: build-deployer
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        # Add "a10" to this list once capacity increases.
-        vm_size: ["a100-40gb", "l40s"]
-        parallelism: [20]
-        index:
-          [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
+        vm_size: [""]
+        parallelism: [10]
+        index: [0,1,2,3,4,5,6,7,8,9]
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
           go-version-file: "go.mod"
@@ -63,13 +66,18 @@ jobs:
       - name: Install gotesplit, set FLY_PREFLIGHT_TEST_APP_PREFIX
         run: |
           curl -sfL https://raw.githubusercontent.com/Songmu/gotesplit/v0.2.1/install.sh | sh -s
-          echo "FLY_PREFLIGHT_TEST_APP_PREFIX=pf-gpu-gha-$(openssl rand -hex 4)" >> "$GITHUB_ENV"
+          echo "FLY_PREFLIGHT_TEST_APP_PREFIX=pf-gha-$(openssl rand -hex 4)" >> "$GITHUB_ENV"
       - uses: actions/download-artifact@v4
         with:
-          name: flyctl
-          path: master-build
-      - name: Run preflight GPU tests
-        id: preflight
+          name: deployer-flyctl
+          path: deployer-bin
+      - name: Move flyctl binary to correct directory
+        run: |
+          mkdir -p bin
+          mv deployer-bin/flyctl bin/flyctl
+          chmod +x bin/flyctl
+      - name: Run deployer tests
+        id: deployer-tests
         env:
           FLY_PREFLIGHT_TEST_ACCESS_TOKEN: ${{ secrets.FLYCTL_PREFLIGHT_CI_FLY_API_TOKEN }}
           FLY_PREFLIGHT_TEST_FLY_ORG: flyctl-ci-preflight
@@ -78,36 +86,39 @@ jobs:
           FLY_PREFLIGHT_TEST_NO_PRINT_HISTORY_ON_FAIL: "true"
           FLY_FORCE_TRACE: "true"
           FLY_PREFLIGHT_TEST_VM_SIZE: ${{ matrix.vm_size }}
+          FLY_DEPLOYER_IMAGE: "flyio/deployer:${{ github.sha }}"
+          FLY_PREFLIGHT_TEST_APP_PREFIX: "deployertest"
         run: |
-          mv master-build/flyctl bin/flyctl
-          chmod +x bin/flyctl
           export PATH=$PWD/bin:$PATH
           echo -n failed= >> $GITHUB_OUTPUT
-          ./scripts/preflight.sh -r "${{ github.ref }}" -t "${{ matrix.parallelism }}" -i "${{ matrix.index }}" -o $GITHUB_OUTPUT
+          ./scripts/deployer-tests.sh -r "${{ github.ref }}" -t "${{ matrix.parallelism }}" -i "${{ matrix.index }}" -o $GITHUB_OUTPUT
       - name: Post failure to slack
         if: ${{ github.ref == 'refs/heads/master' && failure() }}
-        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d
+        uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
         with:
-          webhook: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
-          webhook-type: incoming-webhook
+          channel-id: 'C0790M2E0G2'
           payload: |
             {
               "blocks": [
                 {
                   "type": "section",
                   "text": {
                     "type": "mrkdwn",
-                    "text": ":sob: preflight GPU tests failed: ${{ steps.preflight.outputs.failed }} ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+                    "text": ":sob: deployer tests failed: ${{ steps.deployer-tests.outputs.failed }} ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
                   }
                 }
               ]
             }
       - uses: superfly/flyctl-actions/setup-flyctl@master
         if: always()
-      - name: Clean up any un-deleted preflight apps
+      - name: Clean up any un-deleted deployer-tests apps
         if: always()
         env:
           FLY_API_TOKEN: ${{ secrets.FLYCTL_PREFLIGHT_CI_FLY_API_TOKEN }}
           FLY_PREFLIGHT_TEST_FLY_ORG: flyctl-ci-preflight
+          FLY_PREFLIGHT_TEST_APP_PREFIX: "deployertest"
         run: |
           ./scripts/delete_preflight_apps.sh "$FLY_PREFLIGHT_TEST_APP_PREFIX"

.github/workflows/preflight.yml

@@ -32,15 +32,17 @@ jobs:
       - name: Install gotesplit, set FLY_PREFLIGHT_TEST_APP_PREFIX
         run: |
           curl -sfL https://raw.githubusercontent.com/Songmu/gotesplit/v0.2.1/install.sh | sh -s
-          echo "FLY_PREFLIGHT_TEST_APP_PREFIX=pf-gha-$(openssl rand -hex 4)" >> "$GITHUB_ENV"
+          echo "FLY_PREFLIGHT_TEST_APP_PREFIX=gha-$GITHUB_RUN_ID-$GITHUB_RUN_ATTEMPT" >> "$GITHUB_ENV"
       # If this workflow is triggered by code changes (eg PRs), download the binary to save time.
       - uses: actions/download-artifact@v4
+        id: download-flyctl
         with:
           name: flyctl
           path: master-build
         continue-on-error: true
       # But if this is a manual run, build the binary first.
       - run: make
+        if: steps.download-flyctl.outcome == 'failure'
       - name: Run preflight tests
         id: preflight
         env:
@@ -80,5 +82,6 @@ jobs:
         env:
           FLY_API_TOKEN: ${{ secrets.FLYCTL_PREFLIGHT_CI_FLY_API_TOKEN }}
           FLY_PREFLIGHT_TEST_FLY_ORG: flyctl-ci-preflight
+          FLY_PREFLIGHT_TEST_APP_PREFIX: "preflight"
         run: |
           ./scripts/delete_preflight_apps.sh "$FLY_PREFLIGHT_TEST_APP_PREFIX"

.github/workflows/sync-docs.yml

@@ -0,0 +1,41 @@
+name: Automatically sync docs for flyctl
+
+on:
+  workflow_run:
+    workflows: ["Automatically release a new version of flyctl"]
+    types:
+      - completed
+
+  workflow_dispatch:
+
+permissions:
+  contents: write
+
+jobs:
+  sync_docs:
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout flyctl
+        uses: actions/checkout@v4
+      - uses: jnwng/github-app-installation-token-action@778da2ab509f3ef5e4b902bc15daf25ef3e34939
+        id: installationToken
+        with:
+          appId: 339363
+          installationId: 37947271
+          privateKey: ${{ secrets.DOCS_SYNCER_GITHUB_APP_PRIVATE_KEY }}
+      - name: Checkout docs
+        uses: actions/checkout@v4
+        with:
+          repository: superfly/docs
+          token: ${{ steps.installationToken.outputs.token }}
+          path: docs
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: "go.mod"
+          check-latest: true
+      - name: Publish CLI docs
+        id: publish-cli-docs
+        env:
+          GITHUB_TOKEN: ${{ steps.installationToken.outputs.token }}
+        run: scripts/publish_docs.sh ${{ github.ref_name }}