Merge pull request #491 from hashgraph/sr/swift-rustless

Author: mehcode

.github/workflows/rust-ci.yml

@@ -17,9 +17,9 @@ jobs:
         with:
           submodules: 'recursive'
       - name: Add `rustfmt` to toolchain
-        run: rustup component add rustfmt
+        run: rustup +nightly component add rustfmt
       - name: Format
-        run: cargo fmt --check
+        run: cargo +nightly fmt --check
 
   check:
     runs-on: ubuntu-22.04

.github/workflows/swift-ci.yml

@@ -2,53 +2,14 @@ name: Swift CI
 on:
   pull_request:
   push: 
-    paths: ["sdk/rust/**", "protobufs/**", "sdk/swift/**"]
+    paths: ["protobufs/**", "sdk/swift/**"]
     branches: ['main']
 
 defaults:
   run:
     working-directory: sdk/swift
 
 jobs:
-  # note: this isn't for distribution (it's for CI builds and tests), and compilation time is being preferred over runtime.
-  build-ffi:
-    strategy:
-      matrix:
-        target: [x86_64-apple-darwin, aarch64-apple-darwin]
-
-    defaults:
-      run:
-        working-directory: sdk/rust
-
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-
-      - uses: Swatinem/rust-cache@v2
-        with:
-          workspaces: |
-            sdk/rust
-
-      - name: Add target `${{ matrix.target }}`
-        run: rustup target add ${{ matrix.target }}
-      - name: Build for `${{ matrix.target }}`
-        run: cargo build -p hedera-crypto --target ${{ matrix.target }}
-
-      - name: 'Upload `${{ matrix.target }}` Artifact'
-        uses: actions/upload-artifact@v3
-        with:
-          name: chedera-${{ matrix.target }}
-          path: sdk/rust/target/${{ matrix.target }}/debug/libhedera_crypto.a
-          retention-days: 1
-      - name: 'Upload `${{ matrix.target }}` Artifact'
-        uses: actions/upload-artifact@v3
-        with:
-          name: chedera-${{ matrix.target }}
-          path: sdk/c/include/hedera.h
-          retention-days: 1
-
   format:
     runs-on: macos-12
     steps:
@@ -62,7 +23,6 @@ jobs:
     strategy:
       matrix:
         swift: ["5.7"]
-    needs: build-ffi
     runs-on: macos-11
     steps:
       - uses: swift-actions/setup-swift@v1
@@ -77,18 +37,6 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.swift }}-spm-${{ github.job }}-${{ hashFiles('**/Package.resolved') }}
           restore-keys: |
             ${{ runner.os }}-${{ matrix.swift }}-spm-
-      - name: Download CHedera artifacts
-        uses: actions/download-artifact@v3
-        with:
-          path: .tmp/
-
-      - name: merge into macos-universal
-        run: |
-          mkdir -p sdk/swift/CHedera.xcframework/macos-universal/Headers
-          cp sdk/swift/CHedera.xcframework/module.modulemap sdk/swift/CHedera.xcframework/macos-universal/headers
-          cp .tmp/chedera-aarch64-apple-darwin/hedera.h sdk/swift/CHedera.xcframework/macos-universal/headers
-          lipo .tmp/chedera-aarch64-apple-darwin/libhedera_crypto.a .tmp/chedera-x86_64-apple-darwin/libhedera_crypto.a -output sdk/swift/CHedera.xcframework/macos-universal/libhedera.a -create
-        working-directory: .
 
       - name: Build
         run: swift build
@@ -97,7 +45,7 @@ jobs:
     strategy:
       matrix:
         swift: ["5.7"]
-    needs: [build-ffi, build]
+    needs: [build]
     runs-on: macos-11
     steps:
       - uses: swift-actions/setup-swift@v1
@@ -112,19 +60,5 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-${{ matrix.swift }}-spm-
 
-
-      - name: Download CHedera artifacts
-        uses: actions/download-artifact@v3
-        with:
-          path: .tmp/
-
-      - name: merge into macos-universal
-        run: |
-          mkdir -p sdk/swift/CHedera.xcframework/macos-universal/Headers
-          cp sdk/swift/CHedera.xcframework/module.modulemap sdk/swift/CHedera.xcframework/macos-universal/headers
-          cp .tmp/chedera-aarch64-apple-darwin/hedera.h sdk/swift/CHedera.xcframework/macos-universal/headers
-          lipo .tmp/chedera-aarch64-apple-darwin/libhedera_crypto.a .tmp/chedera-x86_64-apple-darwin/libhedera_crypto.a -output sdk/swift/CHedera.xcframework/macos-universal/libhedera.a -create
-        working-directory: .
-
       - name: Test
         run: swift test