From 92273829bb04fcfb3b06f4c4ee48f0261b92e3aa Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 1 Dec 2022 01:33:10 -0500 Subject: update ci run to latest nlohmann/json release --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/ci.yml') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 693b9b9..def7b82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -160,7 +160,7 @@ jobs: cd deps git clone https://github.com/nlohmann/json cd json - git checkout db78ac1d7716f56fc9f1b030b715f872f93964e4 + git checkout bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d mkdir build cd build cmake .. -- cgit v1.2.3 From dfb006283c8807da5f02fc4778ae15b2f024906c Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Thu, 26 Jan 2023 01:31:41 -0500 Subject: try to fix cert path --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github/workflows/ci.yml') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index def7b82..984d7f7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,7 @@ jobs: cd build cp *.exe artifactdir/bin cd .. - cp /mingw64/ssl/certs/ca-bundle.crt build/artifactdir/ssl/certs + cp /mingw64/etc/ssl/certs/ca-bundle.crt build/artifactdir/ssl/certs cp -r /mingw64/lib/gdk-pixbuf-2.0 build/artifactdir/lib cp -r res/css res/res res/fonts build/artifactdir/bin cp /mingw64/share/glib-2.0/schemas/gschemas.compiled build/artifactdir/share/glib-2.0/schemas -- cgit v1.2.3 From 3ed51eb155444859c3aa00119857b602066c9c10 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Wed, 1 Feb 2023 23:23:41 -0500 Subject: update cert bundle path --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.github/workflows/ci.yml') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 984d7f7..557526a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,11 +64,11 @@ jobs: - name: Setup Artifact run: | - mkdir -p build/artifactdir/bin build/artifactdir/ssl/certs build/artifactdir/lib build/artifactdir/share/glib-2.0/schemas + mkdir -p build/artifactdir/bin build/artifactdir/etc/ssl/certs build/artifactdir/lib build/artifactdir/share/glib-2.0/schemas cd build cp *.exe artifactdir/bin cd .. - cp /mingw64/etc/ssl/certs/ca-bundle.crt build/artifactdir/ssl/certs + cp /mingw64/etc/ssl/certs/ca-bundle.crt build/artifactdir/etc/ssl/certs cp -r /mingw64/lib/gdk-pixbuf-2.0 build/artifactdir/lib cp -r res/css res/res res/fonts build/artifactdir/bin cp /mingw64/share/glib-2.0/schemas/gschemas.compiled build/artifactdir/share/glib-2.0/schemas -- cgit v1.2.3 From 84cb4dfe83eca0170cb2e813d71f6772bc46c774 Mon Sep 17 00:00:00 2001 From: ouwou <26526779+ouwou@users.noreply.github.com> Date: Sat, 4 Feb 2023 20:20:39 -0500 Subject: update ci --- .github/workflows/ci.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to '.github/workflows/ci.yml') diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 557526a..b886ef0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -57,10 +57,20 @@ jobs: update: true install: ${{ steps.setupmsys.outputs.value }} - - name: Build - run: | - cmake -GNinja -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} - cmake --build build + - name: Build (1) + uses: haya14busa/action-cond@v1 + id: build + with: + cond: ${{ matrix.mindeps == true }} + if_true: | + cmake -GNinja -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} -DUSE_LIBHANDY=OFF + cmake --build build + if_false: | + cmake -GNinja -Bbuild -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }} + cmake --build build + + - name: Build (2) + run: ${{ steps.build.outputs.value }} - name: Setup Artifact run: | @@ -119,6 +129,7 @@ jobs: brew install gtkmm3 brew install nlohmann-json brew install jpeg + brew install libhandy - name: Build uses: lukka/run-cmake@v3 @@ -168,6 +179,7 @@ jobs: sudo make install sudo apt-get install libgtkmm-3.0-dev sudo apt-get install libcurl4-gnutls-dev + sudo apt-get install libhandy-1-dev - name: Build uses: lukka/run-cmake@v3 -- cgit v1.2.3