Make it work on Windows

helgoboss · Mar 14, 2024 · 769337c · 769337c
1 parent b566863
commit 769337c
Show file tree

Hide file tree

Showing 15 changed files with 566 additions and 974 deletions.
diff --git a/.github/workflows/linux-aarch64.yml b/.github/workflows/linux-aarch64.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           target: aarch64-unknown-linux-gnu
           override: true
       - name: cargo test (for generating dialogs with php)

diff --git a/.github/workflows/linux-armv7.yml b/.github/workflows/linux-armv7.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           target: armv7-unknown-linux-gnueabihf
           override: true
       - name: cargo test (for generating dialogs with php)

diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -35,7 +35,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - name: cargo check
         uses: actions-rs/cargo@v1
@@ -64,7 +64,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - name: cargo build
         uses: actions-rs/cargo@v1
@@ -96,7 +96,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - run: rustup component add rustfmt
       - name: cargo fmt
@@ -127,7 +127,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - run: rustup component add clippy
       - name: cargo clippy

diff --git a/.github/workflows/macos-aarch64.yml b/.github/workflows/macos-aarch64.yml
@@ -22,8 +22,8 @@ jobs:
       - uses: webfactory/[email protected]
         with:
           ssh-private-key: |
-              ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }}
-              ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }}
+            ${{ secrets.PRIVATE_PLAYTIME_CLIP_ENGINE_DEPLOY_KEY }}
+            ${{ secrets.PRIVATE_HELGOBOSS_LICENSE_PROCESSOR_DEPLOY_KEY }}
       - name: Update submodules
         run: |
           git submodule update --init
@@ -32,15 +32,15 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           target: aarch64-apple-darwin
           override: true
       - name: Set SDKROOT
         run: echo "SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path)" >> $GITHUB_ENV
       - name: Set MACOSX_DEPLOYMENT_TARGET
         run: echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version)" >> $GITHUB_ENV
-#      - name: Setup tmate session
-#        uses: mxschmitt/action-tmate@v2
+      #      - name: Setup tmate session
+      #        uses: mxschmitt/action-tmate@v2
       - name: cargo build
         uses: actions-rs/cargo@v1
         with:

diff --git a/.github/workflows/macos-x86_64.yml b/.github/workflows/macos-x86_64.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - name: cargo check
         uses: actions-rs/cargo@v1
@@ -62,15 +62,15 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - name: cargo build
         uses: actions-rs/cargo@v1
         with:
           command: build
           args: --features playtime,egui
-#      - name: Setup tmate session
-#        uses: mxschmitt/action-tmate@v2
+      #      - name: Setup tmate session
+      #        uses: mxschmitt/action-tmate@v2
       - name: cargo test
         uses: actions-rs/cargo@v1
         env:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -59,26 +59,26 @@ jobs:
             strip-cmd: strip
             profile: release
             features: ""
-#          - artifact: linux-aarch64
-#            os: ubuntu-22.04
-#            toolchain-suffix: x86_64-unknown-linux-gnu
-#            lib-file-name: librealearn.so
-#            extension-file-name: ""
-#            target: aarch64-unknown-linux-gnu
-#            use-cross: true
-#            strip-cmd: aarch64-linux-gnu-strip
-#            profile: release
-#            features: ""
-#          - artifact: linux-armv7
-#            os: ubuntu-22.04
-#            toolchain-suffix: x86_64-unknown-linux-gnu
-#            lib-file-name: librealearn.so
-#            extension-file-name: ""
-#            target: armv7-unknown-linux-gnueabihf
-#            use-cross: true
-#            strip-cmd: arm-linux-gnueabihf-strip
-#            profile: release
-#            features: ""
+    #          - artifact: linux-aarch64
+    #            os: ubuntu-22.04
+    #            toolchain-suffix: x86_64-unknown-linux-gnu
+    #            lib-file-name: librealearn.so
+    #            extension-file-name: ""
+    #            target: aarch64-unknown-linux-gnu
+    #            use-cross: true
+    #            strip-cmd: aarch64-linux-gnu-strip
+    #            profile: release
+    #            features: ""
+    #          - artifact: linux-armv7
+    #            os: ubuntu-22.04
+    #            toolchain-suffix: x86_64-unknown-linux-gnu
+    #            lib-file-name: librealearn.so
+    #            extension-file-name: ""
+    #            target: armv7-unknown-linux-gnueabihf
+    #            use-cross: true
+    #            strip-cmd: arm-linux-gnueabihf-strip
+    #            profile: release
+    #            features: ""
     env:
       # This is relevant for macOS builds only (and only if not overridden).
       # TODO-high This is temporarily 10.9 (should be 10.7) until  https://github.com/rust-lang/cc-rs/issues/902 is fixed
@@ -99,7 +99,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0-${{ matrix.toolchain-suffix }}
+          toolchain: 1.76.0-${{ matrix.toolchain-suffix }}
           target: ${{ matrix.target }}
           override: true
       # Install OS dependencies (Linux/macOS only)
@@ -289,15 +289,15 @@ jobs:
           asset_name: realearn-linux-x86_64.so
           asset_content_type: application/octet-stream
       # Upload Linux aarch64 artifacts
-#      - name: Upload linux-aarch64 release artifact
-#        uses: actions/upload-release-asset@v1
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#        with:
-#          upload_url: ${{ steps.create_release.outputs.upload_url }}
-#          asset_path: ./linux-aarch64/librealearn.so
-#          asset_name: realearn-linux-aarch64.so
-#          asset_content_type: application/octet-stream
+      #      - name: Upload linux-aarch64 release artifact
+      #        uses: actions/upload-release-asset@v1
+      #        env:
+      #          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #        with:
+      #          upload_url: ${{ steps.create_release.outputs.upload_url }}
+      #          asset_path: ./linux-aarch64/librealearn.so
+      #          asset_name: realearn-linux-aarch64.so
+      #          asset_content_type: application/octet-stream
       # Upload Linux armv7 artifacts
 #      - name: Upload linux-armv7 release artifact
 #        uses: actions/upload-release-asset@v1

diff --git a/.github/workflows/windows-i686.yml b/.github/workflows/windows-i686.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0-i686-pc-windows-msvc
+          toolchain: 1.76.0-i686-pc-windows-msvc
           target: i686-pc-windows-msvc
           override: true
       - name: cargo build

diff --git a/.github/workflows/windows-x86_64.yml b/.github/workflows/windows-x86_64.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - name: cargo check
         uses: actions-rs/cargo@v1
@@ -57,7 +57,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.75.0
+          toolchain: 1.76.0
           override: true
       - name: cargo build
         uses: actions-rs/cargo@v1