Fix CI after workspace flattening

.github/workflows/dotslash-config.json

@@ -8,9 +8,9 @@
           "path": "dev-scope-aarch64-apple-darwin/scope"
         },
         "macos-aarch64": {
-          "regex": "^dev-scope-x86_64-apple-darwin",
+          "regex": "^dev-scope-aarch64-apple-darwin",
           "format": "tar.xz",
-          "path": "dev-scope-x86_64-apple-darwin/scope"
+          "path": "dev-scope-aarch64-apple-darwin/scope"
         },
         "linux-aarch64": {
           "regex": "^dev-scope-aarch64-unknown-linux-gnu",
@@ -32,9 +32,9 @@
           "path": "dev-scope-aarch64-apple-darwin/scope-intercept"
         },
         "macos-aarch64": {
-          "regex": "^dev-scope-x86_64-apple-darwin",
+          "regex": "^dev-scope-aarch64-apple-darwin",
           "format": "tar.xz",
-          "path": "dev-scope-x86_64-apple-darwin/scope-intercept"
+          "path": "dev-scope-aarch64-apple-darwin/scope-intercept"
         },
         "linux-aarch64": {
           "regex": "^dev-scope-aarch64-unknown-linux-gnu",

.github/workflows/release.yml

@@ -47,7 +47,7 @@ on:
 jobs:
   # Run 'dist plan' (or host) to determine what tasks we need to do
   plan:
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     outputs:
       val: ${{ steps.plan.outputs.manifest }}
       tag: ${{ !github.event.pull_request && github.ref_name || '' }}
@@ -165,22 +165,12 @@ jobs:
             ${{ steps.cargo-dist.outputs.paths }}
             ${{ env.BUILD_MANIFEST_NAME }}
 
-  custom-build-linux-arm:
-    needs:
-      - plan
-    if: ${{ needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload' }}
-    uses: ./.github/workflows/build-linux-arm.yml
-    with:
-      plan: ${{ needs.plan.outputs.val }}
-    secrets: inherit
-
   # Build and package all the platform-agnostic(ish) things
   build-global-artifacts:
     needs:
       - plan
       - build-local-artifacts
-      - custom-build-linux-arm
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json
@@ -226,7 +216,6 @@ jobs:
     needs:
       - plan
       - build-local-artifacts
-      - custom-build-linux-arm
     uses: ./.github/workflows/build-linux-pkgs.yml
     with:
       plan: ${{ needs.plan.outputs.val }}
@@ -236,14 +225,13 @@ jobs:
     needs:
       - plan
       - build-local-artifacts
-      - custom-build-linux-arm
       - build-global-artifacts
       - custom-build-linux-pkgs
     # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine)
-    if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-linux-pkgs.result == 'skipped' || needs.custom-build-linux-pkgs.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') && (needs.custom-build-linux-arm.result == 'skipped' || needs.custom-build-linux-arm.result == 'success') }}
+    if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-linux-pkgs.result == 'skipped' || needs.custom-build-linux-pkgs.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     outputs:
       val: ${{ steps.host.outputs.manifest }}
     steps:
@@ -304,7 +292,7 @@ jobs:
     needs:
       - plan
       - host
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       PLAN: ${{ needs.plan.outputs.val }}
@@ -355,7 +343,7 @@ jobs:
     # still allowing individual publish jobs to skip themselves (for prereleases).
     # "host" however must run to completion, no skipping allowed!
     if: ${{ always() && needs.host.result == 'success' && (needs.publish-homebrew-formula.result == 'skipped' || needs.publish-homebrew-formula.result == 'success') }}
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:

dist-workspace.toml

@@ -12,7 +12,7 @@ installers = ["shell", "homebrew"]
 # A GitHub repo to push Homebrew formulas to
 tap = "oscope-dev/homebrew-formulas"
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
+targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-unknown-linux-gnu", "x86_64-unknown-linux-musl"]
 # Global artifacts jobs to run in CI
 global-artifacts-jobs = ["./build-linux-pkgs"]
 # Publish jobs to run in CI
@@ -23,21 +23,7 @@ pr-run-mode = "plan"
 publish-prereleases = true
 # Post-announce jobs to run in CI
 post-announce-jobs = ["./dotslash"]
-# Local artifacts jobs to run in CI
-local-artifacts-jobs = ["./build-linux-arm"]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program
 install-updater = false
-
-[dist.github-custom-runners]
-global = "ubuntu-latest"
-
-[dist.github-custom-runners.x86_64-unknown-linux-gnu]
-runner = "ubuntu-latest"
-
-[dist.github-custom-runners.x86_64-unknown-linux-musl]
-runner = "ubuntu-latest"
-
-[dist.github-custom-runners.aarch64-apple-darwin]
-runner = "macos-latest"