diff --git a/.github/workflows/freebsd_meson.yml b/.github/workflows/freebsd_meson.yml index 9c9a1548e..71a1267ad 100644 --- a/.github/workflows/freebsd_meson.yml +++ b/.github/workflows/freebsd_meson.yml @@ -22,10 +22,7 @@ jobs: echo $SHELL sudo pkg install -y python3 bash meson ninja pkgconf sudo pkg install -y gmake binutils zstd - pwd - ls . mkdir builddir && cd builddir meson setup -Ddwarfexample=true . .. ninja ninja test - diff --git a/.github/workflows/mac_meson.yml b/.github/workflows/mac_meson.yml index 7f5c16f8b..e2a60f546 100644 --- a/.github/workflows/mac_meson.yml +++ b/.github/workflows/mac_meson.yml @@ -13,7 +13,6 @@ jobs: - name: tools run: | brew install meson ninja - brew install --overwrite pkgconf - name: run: | mkdir builddir && cd builddir diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dfa55b486..f3956faf2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -65,15 +65,15 @@ jobs: uses: cross-platform-actions/action@v0.20.0 with: operating_system: freebsd - sync_files: false + sync_files: true version: '13.2' run: | uname -a freebsd-version echo $SHELL - sudo pkg install -y python3 bash automake - sudo pkg install -y gmake binutils lzlib - sh ./autogen.sh + sudo pkg install -y python3 bash automake pkgconf + sudo pkg install -y libtool gmake binutils lzlib + autoreconf --warnings=all -vif ./configure make make check @@ -86,7 +86,7 @@ jobs: uses: cross-platform-actions/action@v0.20.0 with: operating_system: freebsd - sync_files: false + sync_files: runner-to-vm version: '13.2' run: | uname -a @@ -108,14 +108,14 @@ jobs: uses: cross-platform-actions/action@v0.20.0 with: operating_system: freebsd - sync_files: false + sync_files: runner-to-vm version: '13.2' run: | uname -a freebsd-version echo $SHELL sudo pkg install -y python3 bash meson ninja - sudo pkg install -y pkgconf gmake binutils lzlib + sudo pkg install -y pkgconf gmake binutils zstd mkdir build && cd build meson setup -Ddwarfexample=true . .. ninja @@ -157,7 +157,6 @@ jobs: - name: brew run: | brew install meson ninja - #brew install --overwrite pkgconf - name: meson run: | mkdir builddir && cd builddir