diff --git a/.github/workflows/SundialKitStream.yml b/.github/workflows/SundialKitStream.yml index 6de6493..d5693de 100644 --- a/.github/workflows/SundialKitStream.yml +++ b/.github/workflows/SundialKitStream.yml @@ -24,9 +24,12 @@ jobs: nightly: true steps: - uses: actions/checkout@v4 + - name: Ensure remote dependencies + run: ./Scripts/ensure-remote-deps.sh - uses: brightdigit/swift-build@v1.4.0 with: scheme: ${{ env.PACKAGE_NAME }} + skip-package-resolved: true - uses: sersoft-gmbh/swift-coverage-action@v4 id: coverage-files with: @@ -114,6 +117,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Ensure remote dependencies + run: ./Scripts/ensure-remote-deps.sh + - name: Build and Test uses: brightdigit/swift-build@v1.4.0 with: @@ -123,6 +129,7 @@ jobs: deviceName: ${{ matrix.deviceName }} osVersion: ${{ matrix.osVersion }} download-platform: ${{ matrix.download-platform }} + skip-package-resolved: true # Coverage Steps - name: Process Coverage @@ -143,6 +150,8 @@ jobs: LINT_MODE: STRICT steps: - uses: actions/checkout@v4 + - name: Ensure remote dependencies + run: ./Scripts/ensure-remote-deps.sh - name: Install mise uses: jdx/mise-action@v2 with: diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ca63144..9c49dee 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -57,9 +57,12 @@ jobs: swift --version swift package --version + - name: Ensure remote dependencies + run: ./Scripts/ensure-remote-deps.sh + # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -77,6 +80,6 @@ jobs: swift build - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 with: category: "/language:${{matrix.language}}" diff --git a/Package.resolved b/Package.resolved deleted file mode 100644 index 6a0c3f6..0000000 --- a/Package.resolved +++ /dev/null @@ -1,15 +0,0 @@ -{ - "originHash" : "bb26fa541c8043161a229c70d629895a66f222ad1353a6f5a22506d5b8fa4241", - "pins" : [ - { - "identity" : "sundialkit", - "kind" : "remoteSourceControl", - "location" : "https://github.com/brightdigit/SundialKit.git", - "state" : { - "revision" : "ff0e3f28e61107d26405c05ec1fa9637dbce05ed", - "version" : "2.0.0-alpha.1" - } - } - ], - "version" : 3 -} diff --git a/Package.swift b/Package.swift index 5b09d31..2be5797 100644 --- a/Package.swift +++ b/Package.swift @@ -59,7 +59,7 @@ let package = Package( ) ], dependencies: [ - .package(url: "https://github.com/brightdigit/SundialKit.git", from: "2.0.0-alpha.1") + .package(name: "SundialKit", path: "../SundialKit") ], targets: [ .target( diff --git a/Scripts/ensure-remote-deps.sh b/Scripts/ensure-remote-deps.sh index 062430a..f95e952 100755 --- a/Scripts/ensure-remote-deps.sh +++ b/Scripts/ensure-remote-deps.sh @@ -5,8 +5,8 @@ set -euo pipefail REMOTE_URL="https://github.com/brightdigit/SundialKit.git" -REMOTE_BRANCH="branch: \"48-demo-applications-part-3\"" -LOCAL_PATH="../../" +REMOTE_BRANCH="branch: \"bitness-v0.0.8\"" +LOCAL_PATH="../SundialKit" PACKAGE_FILE="Package.swift"