diff --git a/.github/workflows/benchmark_comment.yml b/.github/workflows/benchmark_comment.yml index 8fc3d567d1..e04229e8b0 100644 --- a/.github/workflows/benchmark_comment.yml +++ b/.github/workflows/benchmark_comment.yml @@ -9,7 +9,7 @@ on: jobs: macro_benchmarks_comment: name: Benchmark comment on commit - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest if: > github.event.workflow_run.conclusion == 'success' steps: diff --git a/.github/workflows/benchmark_pr_track.yml b/.github/workflows/benchmark_pr_track.yml index ff55501085..1f460a26ba 100644 --- a/.github/workflows/benchmark_pr_track.yml +++ b/.github/workflows/benchmark_pr_track.yml @@ -12,7 +12,7 @@ concurrency: jobs: micro_benchmarks_pr_track: if: github.event.workflow_run.conclusion == 'success' - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest env: BENCHMARK_RESULTS: benchmark_results.txt PR_EVENT: event.json diff --git a/.github/workflows/build-website.yml b/.github/workflows/build-website.yml index 7f2121a14b..72a1f36f03 100644 --- a/.github/workflows/build-website.yml +++ b/.github/workflows/build-website.yml @@ -7,7 +7,7 @@ on: jobs: build_website: - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - name: Build website env: diff --git a/.github/workflows/build_matrix.yml b/.github/workflows/build_matrix.yml index 555bc8239e..3e09d85b9a 100644 --- a/.github/workflows/build_matrix.yml +++ b/.github/workflows/build_matrix.yml @@ -10,7 +10,7 @@ jobs: # IMPORTANT: in case of changing the structure of this file make sure to test # the changes against `npm/gen-root.ts` file setup-matrix: - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest outputs: matrix: ${{ steps.setup-matrix.outputs.matrix }} steps: @@ -33,34 +33,34 @@ jobs: ] include: - build: linux-x64-gnu - os: blacksmith-4vcpu-ubuntu-2204 + os: ubuntu-latest rust: stable target: x86_64-unknown-linux-gnu libc: glibc - build: linux-x64-musl - os: blacksmith-4vcpu-ubuntu-2204 + os: ubuntu-latest rust: stable target: x86_64-unknown-linux-musl libc: musl cross: true - build: linux-arm64-gnu - os: blacksmith-4vcpu-ubuntu-2204 + os: ubuntu-latest rust: stable target: aarch64-unknown-linux-gnu libc: glibc cross: true - build: linux-arm64-musl - os: blacksmith-4vcpu-ubuntu-2204 + os: ubuntu-latest rust: stable target: aarch64-unknown-linux-musl libc: musl cross: true - build: linux-ia32-gnu - os: blacksmith-4vcpu-ubuntu-2204 + os: ubuntu-latest rust: stable target: i686-unknown-linux-gnu libc: glibc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d0a9d7890..52b302ba23 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: check_if_build: name: Check if Build - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -40,7 +40,7 @@ jobs: test_aws_build: name: Test AWS Lambda Build if: github.event_name == 'pull_request' - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest defaults: run: working-directory: ./tailcall-aws-lambda @@ -52,7 +52,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1 - name: Install Python - uses: useblacksmith/setup-python@v6 + uses: actions/setup-python@v5 with: python-version: "3.12" @@ -64,7 +64,7 @@ jobs: test_wasm: name: Run Tests (WASM) - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest defaults: run: working-directory: ./tailcall-wasm @@ -76,7 +76,7 @@ jobs: target: wasm32-unknown-unknown - name: Install Node.js - uses: useblacksmith/setup-node@v5 + uses: actions/setup-node@v4 with: node-version: "20.11.0" @@ -90,7 +90,7 @@ jobs: test_cf: name: Run Tests (Cloudflare) - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest defaults: run: working-directory: ./tailcall-cloudflare @@ -104,7 +104,7 @@ jobs: target: wasm32-unknown-unknown - name: Install Node.js - uses: useblacksmith/setup-node@v5 + uses: actions/setup-node@v4 with: node-version: "20.11.0" @@ -116,7 +116,7 @@ jobs: test: name: Run Tests on ${{ matrix.build }} - runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }} + runs-on: ${{ matrix.os || 'ubuntu-latest' }} needs: setup_build_matrix strategy: fail-fast: false @@ -129,7 +129,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Node.js - uses: useblacksmith/setup-node@v5 + uses: actions/setup-node@v4 with: node-version: "20.11.0" - name: Install Prettier @@ -145,7 +145,7 @@ jobs: - name: Cache NASM if: runner.os == 'Windows' - uses: useblacksmith/cache@v5 + uses: actions/cache@v4 with: path: | nasm-2.16.02 @@ -201,7 +201,7 @@ jobs: check-examples: name: Check Examples - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Set up Rust @@ -223,7 +223,7 @@ jobs: draft_release: name: Draft Release if: github.event_name == 'push' && github.ref == 'refs/heads/main' - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest permissions: contents: write pull-requests: write @@ -253,7 +253,7 @@ jobs: needs: [setup_build_matrix, test, draft_release, check_if_build, test_cf, test_wasm] # TODO: put a condition to separate job that other will depend on to remove duplication? if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true') - runs-on: ${{ matrix.os || 'blacksmith-4vcpu-ubuntu-2204' }} + runs-on: ${{ matrix.os || 'ubuntu-latest' }} strategy: fail-fast: false matrix: ${{ fromJson(needs.setup_build_matrix.outputs.matrix) }} @@ -288,7 +288,7 @@ jobs: - name: Install Node.js if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main') - uses: useblacksmith/setup-node@v5 + uses: actions/setup-node@v4 with: node-version: 20.11.0 registry-url: https://registry.npmjs.org @@ -332,7 +332,7 @@ jobs: name: Release (AWS Lambda) needs: [test, draft_release, check_if_build, test_cf] if: github.event_name == 'push' && github.ref == 'refs/heads/main' && (needs.check_if_build.outputs.check_if_build == 'true') - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest permissions: contents: write pull-requests: write @@ -348,7 +348,7 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@v1 - name: Install Python - uses: useblacksmith/setup-python@v6 + uses: actions/setup-python@v5 with: python-version: "3.12" @@ -376,7 +376,7 @@ jobs: name: Semantic Release if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main') needs: [draft_release, release, release_lambda] - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest permissions: contents: write pull-requests: write @@ -396,12 +396,12 @@ jobs: name: Publish NPM main package needs: [draft_release, release] if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main') - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - name: Checkout Current Branch (Fast) uses: actions/checkout@v4 - name: Install Node - uses: useblacksmith/setup-node@v5 + uses: actions/setup-node@v4 with: node-version: 20.11.0 registry-url: https://registry.npmjs.org @@ -441,7 +441,7 @@ jobs: APP_VERSION: ${{ needs.draft_release.outputs.create_release_name }} # Ensure APP_VERSION is set correctly needs: [draft_release, release] if: (startsWith(github.event.head_commit.message, 'feat') || startsWith(github.event.head_commit.message, 'fix')) && (github.event_name == 'push' && github.ref == 'refs/heads/main') - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest # Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job. permissions: contents: read @@ -484,7 +484,7 @@ jobs: permissions: contents: write pull-requests: write - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index fa3663656a..016cb790f8 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -9,7 +9,7 @@ on: jobs: label-sync: - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 46778afd5f..c386752723 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -17,7 +17,7 @@ concurrency: jobs: lint: name: Run Formatter and Lint Check - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest permissions: pull-requests: write contents: write @@ -26,7 +26,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Node.js - uses: useblacksmith/setup-node@v5 + uses: actions/setup-node@v4 with: node-version: "20.11.0" - name: Install Prettier diff --git a/.github/workflows/pr-convention.yml b/.github/workflows/pr-convention.yml index d319a0e8ed..7492cd48cc 100644 --- a/.github/workflows/pr-convention.yml +++ b/.github/workflows/pr-convention.yml @@ -12,7 +12,7 @@ permissions: jobs: title-check: name: Check PR Title - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - name: All PRs uses: amannn/action-semantic-pull-request@v5 diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index f48360b4c0..59a7cfa8c8 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -18,7 +18,7 @@ jobs: permissions: contents: write pull-requests: write - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - uses: release-drafter/release-drafter@v6 env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 62e967add7..bd3654e7e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: deploy: name: Deploy App - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest concurrency: group: deploy-job cancel-in-progress: true diff --git a/.github/workflows/spell-check.yml b/.github/workflows/spell-check.yml index dc34929602..7e5708b558 100644 --- a/.github/workflows/spell-check.yml +++ b/.github/workflows/spell-check.yml @@ -19,7 +19,7 @@ on: jobs: check_spelling: name: Check spelling - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 07545a170c..22ea7987b7 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -14,7 +14,7 @@ env: jobs: stale: - runs-on: blacksmith-4vcpu-ubuntu-2204 + runs-on: ubuntu-latest steps: - uses: actions/stale@v9 with: