From bec1968201fe7f1303b3536f4e492b3f912a2fc1 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 20:58:49 +0100 Subject: [PATCH 01/16] Build on Ubuntu Everything in the yml file for ease of understanding. No Docker. For https://github.com/AppImageCommunity/AppImageUpdate/issues/239 --- .github/workflows/ubuntu.yml | 39 ++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/ubuntu.yml diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml new file mode 100644 index 0000000..aa9edfd --- /dev/null +++ b/.github/workflows/ubuntu.yml @@ -0,0 +1,39 @@ +name: Build AppImageUpdate and AppImageKit + +on: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Install dependencies + run: | + sudo apt -y update + sudo apt -y install wget git cmake g++ libcurl4-openssl-dev libx11-dev libz-dev libfuse-dev librsvg2-dev libssl-dev libinotifytools0-dev libarchive-dev liblzma-dev + + - name: Build AppImageUpdate + run: | + git clone --recursive https://github.com/AppImage/AppImageUpdate + cd AppImageUpdate/ + mkdir build/ + cd build/ + cmake -DBUILD_QT_UI=OFF -DCMAKE_INSTALL_PREFIX=/usr .. + make -j$(nproc) + sudo make install + cd .. + + - name: Build AppImageKit + run: | + git clone --recursive https://github.com/AppImage/AppImageKit + cd AppImageKit/ + mkdir build/ + cd build/ + cmake -DUSE_SYSTEM_XZ=ON -DUSE_SYSTEM_INOTIFY_TOOLS=ON -DUSE_SYSTEM_LIBARCHIVE=ON -DUSE_SYSTEM_GTEST=OFF -DCMAKE_INSTALL_PREFIX=/usr .. + make -j$(nproc) + sudo make install From 2977fff69c23517c64ac20a4cd9f1211a80259de Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:03:19 +0100 Subject: [PATCH 02/16] on: pull_request --- .github/workflows/ubuntu.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index aa9edfd..47488c7 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,9 +1,7 @@ name: Build AppImageUpdate and AppImageKit on: - push: - branches: - - main + pull_request jobs: build: From e6a2363caba69cd33c4cc0faa48e3d7a8e669c7f Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:05:46 +0100 Subject: [PATCH 03/16] Simplify --- .github/workflows/ubuntu.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 47488c7..2f410d6 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -1,4 +1,4 @@ -name: Build AppImageUpdate and AppImageKit +name: Build AppImageUpdate on Ubuntu without Docker on: pull_request @@ -25,13 +25,3 @@ jobs: make -j$(nproc) sudo make install cd .. - - - name: Build AppImageKit - run: | - git clone --recursive https://github.com/AppImage/AppImageKit - cd AppImageKit/ - mkdir build/ - cd build/ - cmake -DUSE_SYSTEM_XZ=ON -DUSE_SYSTEM_INOTIFY_TOOLS=ON -DUSE_SYSTEM_LIBARCHIVE=ON -DUSE_SYSTEM_GTEST=OFF -DCMAKE_INSTALL_PREFIX=/usr .. - make -j$(nproc) - sudo make install From 0d0890d7c60a072c41863aedd286ed8790a5433f Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:09:29 +0100 Subject: [PATCH 04/16] libboost-dev --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2f410d6..4fd8e82 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,7 +13,7 @@ jobs: - name: Install dependencies run: | sudo apt -y update - sudo apt -y install wget git cmake g++ libcurl4-openssl-dev libx11-dev libz-dev libfuse-dev librsvg2-dev libssl-dev libinotifytools0-dev libarchive-dev liblzma-dev + sudo apt -y install wget git cmake g++ libcurl4-openssl-dev libx11-dev libz-dev libfuse-dev librsvg2-dev libssl-dev libinotifytools0-dev libarchive-dev liblzma-dev libboost-dev - name: Build AppImageUpdate run: | From 64766796860e82fdd5cd6fbe14033e1c7fed0bd0 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:12:03 +0100 Subject: [PATCH 05/16] libargagg-dev --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4fd8e82..d982f1b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -13,7 +13,7 @@ jobs: - name: Install dependencies run: | sudo apt -y update - sudo apt -y install wget git cmake g++ libcurl4-openssl-dev libx11-dev libz-dev libfuse-dev librsvg2-dev libssl-dev libinotifytools0-dev libarchive-dev liblzma-dev libboost-dev + sudo apt -y install wget git cmake g++ libcurl4-openssl-dev libx11-dev libz-dev libfuse-dev librsvg2-dev libssl-dev libinotifytools0-dev libarchive-dev liblzma-dev libboost-dev libargagg-dev - name: Build AppImageUpdate run: | From e5af73988090e01207a67521d4d77ea5c1436b02 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:19:26 +0100 Subject: [PATCH 06/16] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 48 +++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d982f1b..ec16586 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -8,20 +8,50 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v2 - name: Install dependencies run: | - sudo apt -y update - sudo apt -y install wget git cmake g++ libcurl4-openssl-dev libx11-dev libz-dev libfuse-dev librsvg2-dev libssl-dev libinotifytools0-dev libarchive-dev liblzma-dev libboost-dev libargagg-dev + sudo apt-get update + sudo apt-get install -y --no-install-recommends software-properties-common + sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-focal + sudo apt-get update + sudo apt-get install -y qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev - - name: Build AppImageUpdate + - name: Install CMake run: | - git clone --recursive https://github.com/AppImage/AppImageUpdate - cd AppImageUpdate/ - mkdir build/ - cd build/ - cmake -DBUILD_QT_UI=OFF -DCMAKE_INSTALL_PREFIX=/usr .. + wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_focal-x86_64.tar.gz | tar xzv -C/usr --strip-components=1 + + - name: Copy pkgconfig files + run: | + cp pkgconfig/*.pc /usr/lib/x86_64-linux-gnu/pkgconfig/ + + - name: Install GCC 10 + run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test + sudo apt-get install -y g++-10 + export CXX=g++-10 + + - name: Build JSON library + run: | + git clone https://github.com/nlohmann/json.git -b v3.11.2 --depth=1 + cd json + mkdir build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local + make -j "$(nproc --ignore=1)" install + cd ../.. + rm -rf json/ + + - name: Remove libcurl.pc + run: | + rm /usr/lib/x86_64-linux-gnu/pkgconfig/libcurl.pc + + - name: Build project + run: | + mkdir build + cd build + cmake -DCMAKE_INSTALL_PREFIX=/usr .. make -j$(nproc) sudo make install cd .. From e6ea80e495de3302f7bb49848422e3fb5c02293c Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:26:18 +0100 Subject: [PATCH 07/16] ubuntu-20.04 --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index ec16586..384e5d2 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -5,7 +5,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout code uses: actions/checkout@v2 From 35fe27beb38cbebb399ea634909e8e407dcdb68b Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:29:51 +0100 Subject: [PATCH 08/16] sudo --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 384e5d2..8649dc0 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -20,7 +20,7 @@ jobs: - name: Install CMake run: | - wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_focal-x86_64.tar.gz | tar xzv -C/usr --strip-components=1 + wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_focal-x86_64.tar.gz | sudo tar xzv -C/usr --strip-components=1 - name: Copy pkgconfig files run: | From e98d7259f39a52280f18a80f8058e0864f117807 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:32:04 +0100 Subject: [PATCH 09/16] Try without "Copy pkgconfig files" --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8649dc0..0b68345 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -24,7 +24,7 @@ jobs: - name: Copy pkgconfig files run: | - cp pkgconfig/*.pc /usr/lib/x86_64-linux-gnu/pkgconfig/ + # cp pkgconfig/*.pc /usr/lib/x86_64-linux-gnu/pkgconfig/ - name: Install GCC 10 run: | From 4044b5f0dd870d4945deb6eff96552b0347545b4 Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:37:48 +0100 Subject: [PATCH 10/16] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 0b68345..498d918 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -14,32 +14,24 @@ jobs: run: | sudo apt-get update sudo apt-get install -y --no-install-recommends software-properties-common + sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-focal sudo apt-get update - sudo apt-get install -y qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev + sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev - name: Install CMake run: | wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_focal-x86_64.tar.gz | sudo tar xzv -C/usr --strip-components=1 - - name: Copy pkgconfig files - run: | - # cp pkgconfig/*.pc /usr/lib/x86_64-linux-gnu/pkgconfig/ - - - name: Install GCC 10 - run: | - sudo add-apt-repository ppa:ubuntu-toolchain-r/test - sudo apt-get install -y g++-10 - export CXX=g++-10 - - name: Build JSON library run: | + export CXX=g++-10 git clone https://github.com/nlohmann/json.git -b v3.11.2 --depth=1 cd json mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local - make -j "$(nproc --ignore=1)" install + cmake .. -DCMAKE_INSTALL_PREFIX=/usr + sudo make -j "$(nproc --ignore=1)" install cd ../.. rm -rf json/ @@ -49,9 +41,10 @@ jobs: - name: Build project run: | + export CXX=g++-10 mkdir build cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. + cmake .. -DCMAKE_INSTALL_PREFIX=/usr make -j$(nproc) sudo make install cd .. From d5494d8076d9a6ca5d0e342e63efb09ac8348f0c Mon Sep 17 00:00:00 2001 From: probonopd Date: Mon, 25 Nov 2024 21:42:25 +0100 Subject: [PATCH 11/16] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 498d918..b86dba3 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -35,10 +35,6 @@ jobs: cd ../.. rm -rf json/ - - name: Remove libcurl.pc - run: | - rm /usr/lib/x86_64-linux-gnu/pkgconfig/libcurl.pc - - name: Build project run: | export CXX=g++-10 From d290183380042d055735f90c644478db0f9aefd8 Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 26 Nov 2024 20:33:08 +0100 Subject: [PATCH 12/16] -DBUILD_TESTING=OFF --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index b86dba3..e2b60fa 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -40,7 +40,7 @@ jobs: export CXX=g++-10 mkdir build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTING=OFF make -j$(nproc) sudo make install cd .. From 2a4ba47cdd02376cc030da32c050843bee0d6cb9 Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 26 Nov 2024 20:40:05 +0100 Subject: [PATCH 13/16] libzstd-dev --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e2b60fa..4df8fe1 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,7 +17,7 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-focal sudo apt-get update - sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev + sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev libzstd-dev - name: Install CMake run: | From 9b96b0edda2b7e4cf7577095ee35f36d754f26cb Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 26 Nov 2024 20:44:42 +0100 Subject: [PATCH 14/16] libarchive-dev --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 4df8fe1..3e065e3 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,7 +17,7 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-focal sudo apt-get update - sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev libzstd-dev + sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev libarchive-dev libzstd-dev - name: Install CMake run: | From 078989752ef302b163783977d0cd84faf65a28d5 Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 26 Nov 2024 21:54:49 +0100 Subject: [PATCH 15/16] nlohmann-json3-dev --- .github/workflows/ubuntu.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3e065e3..2e91f37 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,24 +17,12 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-focal sudo apt-get update - sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev libarchive-dev libzstd-dev + sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev libarchive-dev libzstd-dev nlohmann-json3-dev - name: Install CMake run: | wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_focal-x86_64.tar.gz | sudo tar xzv -C/usr --strip-components=1 - - name: Build JSON library - run: | - export CXX=g++-10 - git clone https://github.com/nlohmann/json.git -b v3.11.2 --depth=1 - cd json - mkdir build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr - sudo make -j "$(nproc --ignore=1)" install - cd ../.. - rm -rf json/ - - name: Build project run: | export CXX=g++-10 From a025d2e08d81bead5e298b961b96638e02cc19a4 Mon Sep 17 00:00:00 2001 From: probonopd Date: Tue, 26 Nov 2024 22:23:09 +0100 Subject: [PATCH 16/16] cmake --- .github/workflows/ubuntu.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 2e91f37..4c583cc 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -17,13 +17,9 @@ jobs: sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-focal sudo apt-get update - sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev libarchive-dev libzstd-dev nlohmann-json3-dev + sudo apt-get install -y g++-10 qt515base qt515wayland libgl1 libdrm-dev mesa-common-dev build-essential libssl-dev autoconf automake libtool wget vim-common desktop-file-utils pkgconf libgpgme-dev libglib2.0-dev libcairo2-dev librsvg2-dev libfuse-dev git libcurl4-openssl-dev argagg-dev libgcrypt20-dev libboost-dev libarchive-dev libzstd-dev nlohmann-json3-dev cmake - - name: Install CMake - run: | - wget -qO- https://artifacts.assassinate-you.net/prebuilt-cmake/cmake-v3.24.0-ubuntu_focal-x86_64.tar.gz | sudo tar xzv -C/usr --strip-components=1 - - - name: Build project + - name: Build run: | export CXX=g++-10 mkdir build