From 12c5bd6e621ee13c9e1fc52a3e685ec2029b3d6b Mon Sep 17 00:00:00 2001 From: Konstantin Kushnir Date: Tue, 21 May 2024 18:50:31 +0000 Subject: [PATCH 1/7] Test multiple configurations --- .github/workflows/linux-build.yml | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 11052c4..7fddecc 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -10,9 +10,21 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - compiler: - - "gcc" - - "clang" + compiler: ["gcc", "clang"] + configure: [""] + include: + - compiler: gcc + configure: "--disable-c-pkgconfig --disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + - compiler: gcc + configure: "--disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + - compiler: gcc + configure: "--disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + - compiler: gcc + configure: "--disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + - compiler: gcc + configure: "--disable-c-writerchannel --disable-c-vfs" + - compiler: gcc + configure: "--disable-c-vfs" steps: - name: Checkout uses: actions/checkout@v4 @@ -22,14 +34,16 @@ jobs: run: | sudo apt-get install tcl8.6-dev tcl-vfs mkdir "$HOME/install dir" - echo "CFGOPT=--with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV + echo "CFGOPT_COMMON=--with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV + echo "CFGOPT_CUSTOM=\"$CONFIGURE\"" >> $GITHUB_ENV echo "CC=$COMPILER" >> $GITHUB_ENV env: COMPILER: ${{ matrix.compiler }} OPTS: ${{ matrix.compiler }} + CONFIGURE: ${{ matrix.configure }} - name: Configure run: | - ./configure $CFGOPT "--prefix=$HOME/install dir" "--exec-prefix=$HOME/install dir" --enable-xz || { + ./configure $CFGOPT_COMMON $CFGOPT_CUSTOM "--prefix=$HOME/install dir" "--exec-prefix=$HOME/install dir" || { cat config.log echo "::error::Failure during Configure" exit 1 From 0872f5f212387e93b82b98d333953532d3b96d02 Mon Sep 17 00:00:00 2001 From: Konstantin Kushnir Date: Tue, 21 May 2024 18:54:33 +0000 Subject: [PATCH 2/7] Debug --- .github/workflows/linux-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 7fddecc..940830a 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -43,6 +43,7 @@ jobs: CONFIGURE: ${{ matrix.configure }} - name: Configure run: | + set -x ./configure $CFGOPT_COMMON $CFGOPT_CUSTOM "--prefix=$HOME/install dir" "--exec-prefix=$HOME/install dir" || { cat config.log echo "::error::Failure during Configure" From 854ae76e2da8d7a004aae7749bd12fda43d250b1 Mon Sep 17 00:00:00 2001 From: Konstantin Kushnir Date: Tue, 21 May 2024 18:56:22 +0000 Subject: [PATCH 3/7] Fix --- .github/workflows/linux-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 940830a..e5c41e9 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -35,7 +35,7 @@ jobs: sudo apt-get install tcl8.6-dev tcl-vfs mkdir "$HOME/install dir" echo "CFGOPT_COMMON=--with-tcl=/usr/lib/tcl8.6" >> $GITHUB_ENV - echo "CFGOPT_CUSTOM=\"$CONFIGURE\"" >> $GITHUB_ENV + echo "CFGOPT_CUSTOM=$CONFIGURE" >> $GITHUB_ENV echo "CC=$COMPILER" >> $GITHUB_ENV env: COMPILER: ${{ matrix.compiler }} From 7960b6360fb6f63912a4c868959d1ec8518d0f6d Mon Sep 17 00:00:00 2001 From: Konstantin Kushnir Date: Tue, 21 May 2024 18:59:33 +0000 Subject: [PATCH 4/7] Fix ubuntu version --- .github/workflows/linux-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index e5c41e9..1fdfbc8 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -7,7 +7,7 @@ defaults: shell: bash jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: matrix: compiler: ["gcc", "clang"] From 8cb9ce883828dc2b1e39f0c04e2b1fe1e38fbac7 Mon Sep 17 00:00:00 2001 From: Konstantin Kushnir Date: Tue, 21 May 2024 19:09:20 +0000 Subject: [PATCH 5/7] Fix names --- .github/workflows/linux-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 1fdfbc8..442eeb4 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -13,18 +13,26 @@ jobs: compiler: ["gcc", "clang"] configure: [""] include: + - description: "default" - compiler: gcc configure: "--disable-c-pkgconfig --disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + description: "without pkgconfig, pages, fsindex, readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + description: "without pages, fsindex, readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + description: "without fsindex, readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" + description: "without readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-writerchannel --disable-c-vfs" + description: "without writerchannel, vfs" - compiler: gcc configure: "--disable-c-vfs" + description: "without vfs" + name: build (${{ matrix.compiler }}, ${{ matrix.description }}) steps: - name: Checkout uses: actions/checkout@v4 From 246c200e0b609ea1e9762bd1858781434cb59aec Mon Sep 17 00:00:00 2001 From: Konstantin Kushnir Date: Tue, 21 May 2024 19:11:11 +0000 Subject: [PATCH 6/7] Fix --- .github/workflows/linux-build.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 442eeb4..eb942fd 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -16,22 +16,22 @@ jobs: - description: "default" - compiler: gcc configure: "--disable-c-pkgconfig --disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" - description: "without pkgconfig, pages, fsindex, readedchannel, writerchannel, vfs" + description: "no pkgcfg, pages, fsindex, readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-pages --disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" - description: "without pages, fsindex, readedchannel, writerchannel, vfs" + description: "no pages, fsindex, readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-fsindex --disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" - description: "without fsindex, readedchannel, writerchannel, vfs" + description: "no fsindex, readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-readerchannel --disable-c-writerchannel --disable-c-vfs" - description: "without readedchannel, writerchannel, vfs" + description: "no readedchannel, writerchannel, vfs" - compiler: gcc configure: "--disable-c-writerchannel --disable-c-vfs" - description: "without writerchannel, vfs" + description: "no writerchannel, vfs" - compiler: gcc configure: "--disable-c-vfs" - description: "without vfs" + description: "no vfs" name: build (${{ matrix.compiler }}, ${{ matrix.description }}) steps: - name: Checkout @@ -51,7 +51,6 @@ jobs: CONFIGURE: ${{ matrix.configure }} - name: Configure run: | - set -x ./configure $CFGOPT_COMMON $CFGOPT_CUSTOM "--prefix=$HOME/install dir" "--exec-prefix=$HOME/install dir" || { cat config.log echo "::error::Failure during Configure" From 6e3f8c9cca38b4101494cdea945c1d27ee37e70e Mon Sep 17 00:00:00 2001 From: Konstantin Kushnir Date: Tue, 21 May 2024 19:22:51 +0000 Subject: [PATCH 7/7] Add Changelog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 55b6f4f..bbc5944 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * Update 7z lib (xz/lzma2 support) from 23.01 to 24.05 * Fix compiler warnings in --enable-internal-debug mode * Add a presentation from the original authors + * Add multiple configurations to github workflows 2024-05-18 Konstantin Kushnir * Provide successful operation when tcl files unavailable. CookFS should