Merge remote-tracking branch 'origin/master' into deployer

superfly · Dec 9, 2024 · a6fc203 · a6fc203
2 parents c542022 + 13b5ec3
commit a6fc203
Show file tree

Hide file tree

Showing 64 changed files with 1,088 additions and 434 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest-m, macos-latest-xl, windows-latest-l ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/preflight.yml b/.github/workflows/preflight.yml
@@ -18,7 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         parallelism: [20]
-        index: [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]
+        index:
+          [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -48,8 +49,6 @@ jobs:
           FLY_PREFLIGHT_TEST_FLY_REGIONS: ${{ inputs.region }}
           FLY_PREFLIGHT_TEST_NO_PRINT_HISTORY_ON_FAIL: "true"
           FLY_FORCE_TRACE: "true"
-          FLY_PREFLIGHT_TEST_VM_SIZE: ${{ matrix.vm_size }}
-          FLY_PREFLIGHT_TEST_APP_PREFIX: "preflight"
         run: |
           (test -e master-build/flyctl) && mv master-build/flyctl bin/flyctl
           chmod +x bin/flyctl
@@ -58,11 +57,10 @@ jobs:
           ./scripts/preflight.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@37ebaef184d7626c5f204ab8d3baff4262dd30f0
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d
         with:
+          webhook: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [

diff --git a/.github/workflows/preflight_cleanup.yml b/.github/workflows/preflight_cleanup.yml
@@ -33,11 +33,10 @@ jobs:
           go run ./scripts/clean-up-preflight-apps
       - name: Post failure to slack
         if: ${{ github.ref == 'refs/heads/master' && failure() }}
-        uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d
         with:
+          webhook: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [

diff --git a/.github/workflows/preflight_gpu.yml b/.github/workflows/preflight_gpu.yml
@@ -49,7 +49,8 @@ jobs:
         # 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]
+        index:
+          [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -85,11 +86,10 @@ jobs:
           ./scripts/preflight.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@37ebaef184d7626c5f204ab8d3baff4262dd30f0
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d
         with:
+          webhook: ${{ secrets.PREFLIGHT_SLACK_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
           payload: |
             {
               "blocks": [

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest-m, macos-latest-xl, windows-latest-l ]
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
         test:
           - workdir: "."
             target: "test"

diff --git a/.github/workflows/test_install.yml b/.github/workflows/test_install.yml
@@ -70,10 +70,11 @@ jobs:
       max-parallel: 4
       matrix:
         os:
-          - ubuntu-latest
+          # From https://github.com/actions/runner-images/tree/main?tab=readme-ov-file#available-images.
+          - ubuntu-24.04
+          - ubuntu-22.04
           - ubuntu-20.04
-          - macos-latest
-          - macos-12
+          - macos-14
           - macos-13
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/agent/client.go b/agent/client.go
@@ -34,7 +34,7 @@ import (
 )
 
 // Establish starts the daemon, if necessary, and returns a client to it.
-func Establish(ctx context.Context, apiClient flyutil.Client) (*Client, error) {
+func Establish(ctx context.Context, apiClient wireguard.WebClient) (*Client, error) {
 	if err := wireguard.PruneInvalidPeers(ctx, apiClient); err != nil {
 		return nil, err
 	}

diff --git a/example-buildpack/Gemfile b/example-buildpack/Gemfile
diff --git a/example/index.html b/example/index.html