Merge pull request #12 from ChrisTitusTech/F#

Fix CI/CD for F# instead of Rust

Author: ChrisTitusTech

.github/dependabot.yml

@@ -1,9 +1,5 @@
 version: 2
 updates:
-  - package-ecosystem: "cargo"
-    directory: "/"
-    schedule:
-      interval: "weekly"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

.github/workflows/Release.yml

@@ -7,48 +7,52 @@ permissions:
   contents: write
   packages: write
 
-env:
-  CARGO_TERM_COLOR: always
-
 jobs:
   macutil_build:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install musl-tools
-        run: sudo apt-get update && sudo apt-get install musl-tools
-        
-      - name: Cache Cargo registry
-        uses: actions/cache@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
         with:
-          path: ~/.cargo/registry
-          key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-registry-
+          dotnet-version: '9.0.x'
 
-      - name: Cache Cargo index
+      - name: Cache .NET packages
         uses: actions/cache@v4
         with:
-          path: ~/.cargo/git
-          key: ${{ runner.os }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-index-
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: ${{ runner.os }}-nuget-
 
-      - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: x86_64-unknown-linux-musl
+      - name: Restore dependencies
+        run: dotnet restore MacUtilGUI/MacUtilGUI.fsproj
 
-      - name: Install cross-rs for cross-compilation
-        run: cargo install cross
+      - name: Build and publish macOS x64
+        run: |
+          dotnet publish MacUtilGUI/MacUtilGUI.fsproj \
+            --configuration Release \
+            --runtime osx-x64 \
+            --self-contained true \
+            --output ./build/osx-x64 \
+            /p:PublishSingleFile=true \
+            /p:IncludeNativeLibrariesForSelfExtract=true
 
-      - name: Build x86_64 binary
-        run: cargo build --target-dir=build --release --verbose --target=x86_64-unknown-linux-musl --all-features
+      - name: Build and publish macOS ARM64
+        run: |
+          dotnet publish MacUtilGUI/MacUtilGUI.fsproj \
+            --configuration Release \
+            --runtime osx-arm64 \
+            --self-contained true \
+            --output ./build/osx-arm64 \
+            /p:PublishSingleFile=true \
+            /p:IncludeNativeLibrariesForSelfExtract=true
 
-      - name: Build aarch64 binary
+      - name: Rename binaries
         run: |
-          cross build --target-dir=build --release --verbose --target=aarch64-unknown-linux-musl --all-features
-          mv ./build/aarch64-unknown-linux-musl/release/macutil ./build/aarch64-unknown-linux-musl/release/macutil-aarch64
+          mv ./build/osx-x64/MacUtilGUI ./build/osx-x64/macutil-macos-x64
+          mv ./build/osx-arm64/MacUtilGUI ./build/osx-arm64/macutil-macos-arm64
 
       - name: Extract Version
         id: extract_version
@@ -64,16 +68,14 @@ jobs:
           tag_name: ${{ env.version }}
           name: Pre-Release ${{ env.version }}
           body: |
-            ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/macutil/${{ env.version }}/macutil)
-            ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/macutil/${{ env.version }}/macutil-aarch64)
+            ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/macutil/${{ env.version }}/macutil-macos-x64)
+            ![GitHub Downloads (specific asset, specific tag)](https://img.shields.io/github/downloads/ChrisTitusTech/macutil/${{ env.version }}/macutil-macos-arm64)
 
           append_body: true
           generate_release_notes: true
           files: |
-            ./build/x86_64-unknown-linux-musl/release/macutil
-            ./build/aarch64-unknown-linux-musl/release/macutil-aarch64
-            ./start.sh
-            ./startdev.sh
+            ./build/osx-x64/macutil-macos-x64
+            ./build/osx-arm64/macutil-macos-arm64
           prerelease: true
         env:
           version: ${{ env.version }}

.github/workflows/fsharp.yml

@@ -0,0 +1,39 @@
+name: F# Checks
+
+on:
+  pull_request:
+    branches: ["main"]
+    paths:
+      - '**/*.fs'
+      - '**/*.fsproj'
+      - 'MacUtilGUI/**'
+
+jobs:
+  lints:
+    name: F# Build and Format Check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.0.x'
+
+      - name: Cache .NET packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: ${{ runner.os }}-nuget-
+
+      - name: Restore dependencies
+        run: dotnet restore MacUtilGUI/MacUtilGUI.fsproj
+
+      - name: Build project
+        run: dotnet build MacUtilGUI/MacUtilGUI.fsproj --configuration Release --no-restore
+
+      - name: Check F# formatting
+        run: dotnet fantomas --check MacUtilGUI/

.github/workflows/preview.yml

@@ -62,14 +62,14 @@ jobs:
 
       - name: Download binary
         run: |
-          curl -LO "https://github.com/${{ github.repository }}/releases/download/${{ steps.final_tag.outputs.tag_name }}/macutil"
+          curl -LO "https://github.com/${{ github.repository }}/releases/download/${{ steps.final_tag.outputs.tag_name }}/macutil-macos-arm64"
 
       - name: Set env
         id: branch_setup
         run: |
-          chmod +x macutil
+          chmod +x macutil-macos-arm64
           mkdir -p build
-          mv macutil build/macutil
+          mv macutil-macos-arm64 build/macutil
           echo "${{ github.workspace }}/build" >> $GITHUB_PATH
           branch_name=$(echo "${{ steps.final_tag.outputs.tag_name }}" | tr . -)
           echo "branch_name=$branch_name" >> $GITHUB_OUTPUT