Unbreak the CI

lu-zero · Jan 9, 2025 · 3d2231c · 3d2231c
1 parent c4e6c08
commit 3d2231c
Showing 1 changed file with 49 additions and 70 deletions.
diff --git a/.github/workflows/example-project.yml b/.github/workflows/example-project.yml
@@ -33,84 +33,56 @@ jobs:
         with:
           toolchain: stable${{ matrix.toolchain-suffix }}
 
+      - name: Install pkgconf
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        id: msys2
+        with:
+          msystem: ucrt64
+          install: mingw-w64-ucrt-x86_64-pkgconf
+
+      - name: Put pkgconf on PATH
+        if: runner.os == 'Windows'
+        run: Add-Content $env:GITHUB_PATH "${{ steps.msys2.outputs.msys2-location }}\ucrt64\bin"
+
       - name: Install cargo-c applet
-        run: |
-          cargo install --path .
+        run: cargo install --path .
 
       - name: Test example project
         working-directory: example-project
-        run: |
-          cargo test --verbose
+        run: cargo test --verbose
 
       - name: Build C API for example project
         working-directory: example-project
-        run: |
-          cargo cbuild --verbose --release
+        run: cargo cbuild --verbose --release
 
       - name: Run C API tests for example project
         working-directory: example-project
-        run: |
-          cargo ctest --verbose --release
+        run: cargo ctest --verbose --release
 
-      - name: Install into temporary location
+      - name: Install into /usr/local
+        if: runner.os != 'Windows'
         working-directory: example-project
-        run: |
-          cargo cinstall --verbose --release --destdir=temp
+        run: sudo -E env PATH=$PATH cargo cinstall --verbose --release --prefix=/usr/local
 
-      - name: Copy installed files to /usr/local
-        if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
-        working-directory: example-project
-        run: |
-          sudo cp -r temp/usr/local/* /usr/local/
-      
-      - name: Install into Cargo root
-        if: startsWith(matrix.os, 'windows')
-        shell: bash
+      - name: Install into MSYS2 root
+        if: runner.os == 'Windows'
         working-directory: example-project
-        run: |
-          cargo cinstall --verbose --release --prefix=$CARGO_HOME
+        run: cargo cinstall --verbose --release --prefix="${{ steps.msys2.outputs.msys2-location }}\ucrt64"
 
-      - name: Test pkg-config
-        if: startsWith(matrix.os, 'macos')
+      - name: Test pkgconf
+        if: runner.os == 'macOS'
         run: |
           set -x
-          test "$(pkg-config --cflags example_project)" = "-I/usr/local/include/example-project-0.1"
-          test "$(pkg-config --libs example_project)" = "-L/usr/local/lib -lexample-project"
-
-      - name: Install pkgconf
-        if: startsWith(matrix.os, 'ubuntu')
-        uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: pkgconf
-
-      - name: Setup Meson + Ninja
-        if: startsWith(matrix.os, 'windows')
-        run: |
-          python3 -m pip install --upgrade pip setuptools wheel
-          python3 -m pip install meson ninja
-  
-      - name: Setup MSVC for test
-        if: startsWith(matrix.os, 'windows')
-        uses: ilammy/msvc-dev-cmd@v1
-        with:
-          arch: x86_64
-
-      # https://github.com/pkgconf/pkgconf/issues/364
-      - name: Install pkgconf
-        if: startsWith(matrix.os, 'windows')
-        run: |
-          git clone https://github.com/amyspark/pkgconf --branch msvc
-          cd pkgconf
-          meson setup build --prefix=$env:CARGO_HOME
-          meson compile -C build
-          meson install -C build
+          pkgconf --version
+          test "$(pkgconf --cflags example_project)" = "-I/usr/local/include/example-project-0.1"
+          test "$(pkgconf --libs example_project)" = "-L/usr/local/lib -lexample-project"
 
       - name: Test pkgconf
-        if: startsWith(matrix.os, 'ubuntu')
+        if: runner.os == 'Linux'
         run: |
           set -x
           pkgconf --version
-          pkg-config --version
           ARCHDIR=`dpkg-architecture -qDEB_HOST_MULTIARCH`
           # ubuntu seems to add trailing spaces for no specific reasons.
           CFLAGS=$(pkgconf --cflags example_project)
@@ -120,34 +92,41 @@ jobs:
           test "${LIBS%% }" = "-L/usr/local/lib/${ARCHDIR} -lexample-project"
 
       - name: Test pkgconf
-        if: startsWith(matrix.os, 'windows')
+        if: runner.os == 'Windows'
         shell: bash
         run: |
           set -x
           pkgconf --version
-          CFLAGS=$(pkgconf --cflags example_project)
-          LIBS=$(pkgconf --libs example_project)
-
-          test "${CFLAGS%% }" = "-I${CARGO_HOME//\\//}/bin/../include/example-project-0.1"
-          test "${LIBS%% }" = "-L${CARGO_HOME//\\//}/bin/../lib -lexample-project"
+          # use --define-variable=prefix=C:/foo to test relative libdir/includedir generation
+          # https://github.com/lu-zero/cargo-c/commit/76a66cd72eb4271501557eebea7060821e63b702
+          test "$(pkgconf --define-variable=prefix=C:/foo --cflags example_project)" = "-IC:/foo/include/example-project-0.1"
+          test "$(pkgconf --define-variable=prefix=C:/foo --libs example_project)" = "-LC:/foo/lib -lexample-project"
 
       - name: Update dynamic linker cache
-        if: startsWith(matrix.os, 'ubuntu')
-        run: |
-          sudo ldconfig
+        if: runner.os == 'Linux'
+        run: sudo ldconfig
 
       - name: Test usage from C (using Makefile)
-        if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
+        if: runner.os != 'Windows'
         working-directory: example-project/usage-from-c
+        run: make
+
+      - name: Setup Meson + Ninja
+        if: runner.os == 'Windows' && matrix.toolchain-suffix == '-msvc'
         run: |
-          make
+          python3 -m pip install --upgrade pip setuptools wheel
+          python3 -m pip install meson ninja
+
+      - name: Setup MSVC for test
+        if: runner.os == 'Windows' && matrix.toolchain-suffix == '-msvc'
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          arch: x86_64
 
       - name: Test usage from C (Meson)
-        if: startsWith(matrix.os, 'windows') && matrix.toolchain-suffix == '-msvc'
+        if: runner.os == 'Windows' && matrix.toolchain-suffix == '-msvc'
         working-directory: example-project/usage-from-c
-        shell: pwsh
         run: |
-          $env:PKG_CONFIG="$env:CARGO_HOME/bin/pkgconf.exe"
           meson setup build
           meson compile -C build
           meson test -C build