Merge pull request #63 from zoeyfyi/release-1.1.1

Release 1.1.1
zoeyfyi · Dec 7, 2020 · c859a59 · c859a59
2 parents d019a87 + 151b693
commit c859a59
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 91 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,8 +18,17 @@ jobs:
       matrix:
         config:
         - os: macOS-latest
+          pkgconfig: pkg-config
+          pkgconfigpath: /usr/lib/pkgconfig
+          glibcrpath: glib-compile-resources
         - os: ubuntu-latest
+          pkgconfig: pkg-config
+          pkgconfigpath: /usr/lib/pkgconfig
+          glibcrpath: glib-compile-resources
         - os: windows-2019
+          pkgconfig: C:\msys64\mingw64\bin\pkg-config.exe
+          pkgconfigpath: C:\gtk-build\gtk\x64\release\lib\pkgconfig
+          glibcrpath: C:\gtk-build\gtk\x64\release\bin\glib-compile-resources.exe
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -49,6 +58,18 @@ jobs:
       if: runner.os == 'macOS'
       run: brew install gtk+3 pkg-config
     # ======== Windows ========
+    - name: Windows dependencies (update msys)
+      if: runner.os == 'windows'
+      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Syu --noconfirm"
+    - name: Windows dependencies (msys remove cmake)
+      if: runner.os == 'windows'
+      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Rs --noconfirm mingw-w64-x86_64-cmake"
+    - name: Windows dependencies (msys)
+      if: runner.os == 'windows'
+      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Syy --noconfirm mingw-w64-x86_64-pkg-config"
+    - name: Windows dependencies (add msys to path)
+      if: runner.os == 'windows'
+      run: echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
     - name: Windows dependencies (cache gvsbuild)
       if: runner.os == 'windows'
       uses: actions/cache@v2
@@ -73,16 +94,41 @@ jobs:
       working-directory: C:\gtk-build\github\gvsbuild
     - name: Windows dependencies (add gvsbuild bin directory to path)
       if: runner.os == 'windows'
-      run: echo "::add-path::C:\gtk-build\gtk\x64\release\bin"
+      run: echo "C:\gtk-build\gtk\x64\release\bin" >> $GITHUB_PATH
     ################# Dependencies #################
+    - run: ls ${{ matrix.config.pkgconfigpath }}
     - name: Check
       run: cargo check
+      env:
+        GTK_LIB_DIR: C:\msys64\mingw64\bin
+        PKG_CONFIG_ALLOW_CROSS: 1
+        PKG_CONFIG: ${{ matrix.config.pkgconfig }}
+        PKG_CONFIG_PATH: ${{ matrix.config.pkgconfigpath }}
+        GLIB_COMPILE_RESOURCES: ${{ matrix.config.glibcrpath }}
     - name: Test
       run: cargo test -- --nocapture
+      env:
+        GTK_LIB_DIR: C:\msys64\mingw64\bin
+        PKG_CONFIG_ALLOW_CROSS: 1
+        PKG_CONFIG: ${{ matrix.config.pkgconfig }}
+        PKG_CONFIG_PATH: ${{ matrix.config.pkgconfigpath }}
+        GLIB_COMPILE_RESOURCES: ${{ matrix.config.glibcrpath }}
     - name: Fmt
       run: cargo fmt --all -- --check
+      env:
+        GTK_LIB_DIR: C:\msys64\mingw64\bin
+        PKG_CONFIG_ALLOW_CROSS: 1
+        PKG_CONFIG: ${{ matrix.config.pkgconfig }}
+        PKG_CONFIG_PATH: ${{ matrix.config.pkgconfigpath }}
+        GLIB_COMPILE_RESOURCES: ${{ matrix.config.glibcrpath }}
     - name: Clippy
       run: cargo clippy -- -D warnings
+      env:
+        GTK_LIB_DIR: C:\msys64\mingw64\bin
+        PKG_CONFIG_ALLOW_CROSS: 1
+        PKG_CONFIG: ${{ matrix.config.pkgconfig }}  
+        PKG_CONFIG_PATH: ${{ matrix.config.pkgconfigpath }}
+        GLIB_COMPILE_RESOURCES: ${{ matrix.config.glibcrpath }}
     ################# Windows workarounds #################
     - name: Windows dependencies (make release folder)
       run: mkdir release

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
       run: cargo build --release --all-features 
     - name: rename output
       run: mv target/release/tex-match ./tex-match.linux.amd64
-    - uses: actions/upload-artifact@v2.2.0
+    - uses: actions/upload-artifact@v2.2.1
       with:
         name: tex-match.linux.amd64
         path: ./tex-match.linux.amd64
@@ -58,11 +58,15 @@ jobs:
           target
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
     ################# Dependencies #################
+    - name: Windows dependencies (update msys)
+      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Syu --noconfirm"
+    - name: Windows dependencies (msys remove cmake)
+      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Rs --noconfirm mingw-w64-x86_64-cmake"
     - name: Windows dependencies (msys)
-      if: runner.os == 'windows'
-      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Syy --noconfirm mingw-w64-x86_64-adwaita-icon-theme"
+      run: C:\msys64\usr\bin\bash.exe -lc "pacman -Syy --noconfirm mingw-w64-x86_64-pkg-config mingw-w64-x86_64-adwaita-icon-theme"
+    - name: Windows dependencies (add msys to path)
+      run: echo "C:\msys64\mingw64\bin" >> $GITHUB_PATH
     - name: Windows dependencies (cache gvsbuild)
-      if: runner.os == 'windows'
       uses: actions/cache@v2
       id: cache
       with:
@@ -85,16 +89,22 @@ jobs:
       working-directory: C:\gtk-build\github\gvsbuild
     - name: Windows dependencies (add gvsbuild bin directory to path)
       if: runner.os == 'windows'
-      run: echo "::add-path::C:\gtk-build\gtk\x64\release\bin"
+      run: echo "C:\gtk-build\gtk\x64\release\bin" >> $GITHUB_PATH
     ################# Dependencies #################
     # install cargo wix
     - name: install cargo-wix
       run: cargo install cargo-wix
     # build installer
     - name: build
       run: cargo wix -v --nocapture -o tex-match.windows.msi
+      env:
+        GTK_LIB_DIR: C:\msys64\mingw64\bin
+        PKG_CONFIG_ALLOW_CROSS: 1
+        PKG_CONFIG: C:\msys64\mingw64\bin\pkg-config.exe
+        PKG_CONFIG_PATH: C:\gtk-build\gtk\x64\release\lib\pkgconfig
+        GLIB_COMPILE_RESOURCES: C:\gtk-build\gtk\x64\release\bin\glib-compile-resources.exe
     # upload
-    - uses: actions/upload-artifact@v2.2.0
+    - uses: actions/upload-artifact@v2.2.1
       with:
         name: tex-match.windows.msi
         path: ./tex-match.windows.msi
@@ -123,7 +133,7 @@ jobs:
       run: cargo build --release --all-features 
     - name: rename output
       run: mv target/release/tex-match ./tex-match.macos
-    - uses: actions/upload-artifact@v2.2.0
+    - uses: actions/upload-artifact@v2.2.1
       with:
         name: tex-match.macos
         path: ./tex-match.macos
@@ -148,7 +158,7 @@ jobs:
         release: stable
     - name: rename output
       run: mv ${{ steps.snapcraft.outputs.snap }} ./tex-match.snap
-    - uses: actions/upload-artifact@v2.2.0
+    - uses: actions/upload-artifact@v2.2.1
       with:
         name: tex-match.snap
         path: ./tex-match.snap
@@ -177,7 +187,7 @@ jobs:
       run: sudo flatpak-builder --repo=repo build-dir flatpak/uk.co.mrbenshef.TeX-Match.json
     - name: Flatpak build bundle
       run: flatpak build-bundle ./repo tex-match.flatpak uk.co.mrbenshef.TeX-Match
-    - uses: actions/upload-artifact@v2.2.0
+    - uses: actions/upload-artifact@v2.2.1
       with:
         name: tex-match.flatpak
         path: ./tex-match.flatpak