Merge branch 'upstream'

Diordany · Sep 25, 2024 · 5f9b56f · 5f9b56f
2 parents 602bf0e + 461a73c
commit 5f9b56f
Show file tree

Hide file tree

Showing 36 changed files with 2,647 additions and 1,881 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
     container: docker://hhmhh/weylus_build:latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/cache@v3
+    - uses: actions/checkout@v4
+    - uses: actions/cache@v4
       with:
         path: deps/dist*
         key: ${{ runner.os }}-deps-${{ hashFiles('deps/*') }}
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.cargo/registry
@@ -29,22 +29,22 @@ jobs:
       run: ./docker_build.sh
       shell: bash
     - name: Artifacts1
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: linux
         path: packages/weylus-linux.zip
     - name: Artifacts2
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: linux-deb
         path: packages/Weylus*.deb
     - name: Artifacts3
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: windows
         path: packages/weylus-windows.zip
     - name: Publish
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       with:
           files: |
@@ -59,28 +59,28 @@ jobs:
     runs-on: ubuntu-latest
     container: docker://hhmhh/weylus_build_alpine:latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/cache@v3
+    - uses: actions/checkout@v4
+    - uses: actions/cache@v4
       with:
         path: deps/dist*
         key: ${{ runner.os }}-alpine-deps-${{ hashFiles('deps/*') }}
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.cargo/registry
           ~/.cargo/git
           target
         key: ${{ runner.os }}-alpine-cargo-${{ hashFiles('Cargo.lock') }}
     - name: Build
-      run: cargo build --release && cd target/release && tar czf weylus-linux-alpine-musl.tar.gz weylus
+      run: RUSTFLAGS='-C target-feature=-crt-static' cargo build --release && cd target/release && tar czf weylus-linux-alpine-musl.tar.gz weylus
       shell: bash
     - name: Artifacts1
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: linux-alpine-musl
         path: target/release/weylus-linux-alpine-musl.tar.gz
     - name: Publish
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       with:
           files: |
@@ -92,12 +92,12 @@ jobs:
   build-macos:
     runs-on: macOS-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/cache@v3
+    - uses: actions/checkout@v4
+    - uses: actions/cache@v4
       with:
         path: deps/dist
         key: ${{ runner.os }}-deps-${{ hashFiles('deps/*') }}
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: |
           ~/.cargo/registry
@@ -116,14 +116,14 @@ jobs:
     - name: Package
       run: cd target/release/bundle/osx/ && zip -r macOS.zip Weylus.app
     - name: Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ runner.os }}
         path: |
           target/release/bundle/osx/macOS.zip
     - name: ArtifactsDebug
       if: failure()
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ runner.os }}-ffbuild
         path: |
@@ -136,7 +136,7 @@ jobs:
         SSH_PASS: ${{ secrets.SSH_PASS }}
         NGROK_REGION: eu
     - name: Publish
-      uses: softprops/action-gh-release@v1
+      uses: softprops/action-gh-release@v2
       if: startsWith(github.ref, 'refs/tags/')
       with:
           files: |

diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ c_helper/target
 c_helper/Cargo.lock
 *.js
 *.js.map
+*.tar.gz
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -7,6 +7,8 @@ List of Contributors:
 **************************
 Robert Schroll
 Daniel Rutz
+Philipp Urlbauer
+OmegaRogue
 **************************
 
 3-Clause BSD License