From c1e900fd393a5a9a4267304c6d2071efe03f82d5 Mon Sep 17 00:00:00 2001
From: Aaron Sky <aaronsky@skyaaron.com>
Date: Sat, 31 Aug 2024 13:23:01 -0400
Subject: [PATCH] Updated presubmit.yml

---
 .bcr/presubmit.yml              | 61 +++++++++++++++++----------------
 Examples/bzlmod/MyASCTool.swift |  2 +-
 2 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml
index 89f5908b..d4081b5f 100644
--- a/.bcr/presubmit.yml
+++ b/.bcr/presubmit.yml
@@ -1,30 +1,31 @@
-matrix:
-  bazel:
-    - 7.x
-
-tasks:
-  verify_targets_linux:
-    name: Verify Targets (Linux)
-    platform: ubuntu2004
-    bazel: ${{ bazel }}
-    environment:
-      CC: "clang"
-      SWIFT_VERSION: "5.9.2"
-      SWIFT_HOME: "$HOME/swift-$SWIFT_VERSION"
-      PATH: "$PATH:$SWIFT_HOME/usr/bin"
-    shell_commands:
-      - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
-      - "mkdir $SWIFT_HOME"
-      - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
-    build_flags:
-      - "--action_env=PATH"
-    build_targets:
-      - "@asc_swift//:*"
-  verify_targets_macos:
-    name: Verify Targets (macOS)
-    platform: macos
-    bazel: ${{ bazel }}
-    build_targets:
-      - "@asc_swift//:*"
-    build_flags:
-      - "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"
+bcr_test_module:
+  module_path: Examples/bzlmod
+  matrix:
+    bazel:
+      - 7.x
+  tasks:
+    verify_targets_linux:
+      name: Verify Targets (Linux)
+      platform: ubuntu2004
+      bazel: ${{ bazel }}
+      environment:
+        CC: "clang"
+        SWIFT_VERSION: "5.9.2"
+        SWIFT_HOME: "$HOME/swift-5.9.2"
+        PATH: "$PATH:$HOME/swift-5.9.2/usr/bin"
+      shell_commands:
+        - "echo --- Downloading and extracting Swift $SWIFT_VERSION to $SWIFT_HOME"
+        - "mkdir $SWIFT_HOME"
+        - "curl https://download.swift.org/swift-${SWIFT_VERSION}-release/ubuntu2004/swift-${SWIFT_VERSION}-RELEASE/swift-${SWIFT_VERSION}-RELEASE-ubuntu20.04.tar.gz | tar xvz --strip-components=1 -C $SWIFT_HOME"
+      build_flags:
+        - "--action_env=PATH"
+      build_targets:
+        - "//..."
+    verify_targets_macos:
+      name: Verify Targets (macOS)
+      platform: macos
+      bazel: ${{ bazel }}
+      build_targets:
+        - "//..."
+      build_flags:
+        - "--repo_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1"
diff --git a/Examples/bzlmod/MyASCTool.swift b/Examples/bzlmod/MyASCTool.swift
index edc0355f..11dad133 100644
--- a/Examples/bzlmod/MyASCTool.swift
+++ b/Examples/bzlmod/MyASCTool.swift
@@ -15,7 +15,7 @@ public struct MyASCTool {
                 keyID: "...",
                 issuerID: "...",
                 expiryDuration: 20 * 60,  // 20 minutes
-                privateKey: JWT.PrivateKey(contentsOf: URL(filePath: "..."))
+                privateKey: JWT.PrivateKey(contentsOf: URL(fileURLWithPath: "..."))
             )
         )