Skip to content

Commit

Permalink
chore: rc 1
Browse files Browse the repository at this point in the history
  • Loading branch information
maxirmx committed Dec 21, 2024
1 parent 3b0b0ea commit 86b73d0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/test-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,15 @@ jobs:
include:
- env: { os: windows-latest, platform: x64-mingw-ucrt }
ruby: '3.3'
experimental: true
- env: { os: windows-latest, platform: x64-mingw-ucrt }
ruby: '3.1'
experimental: true
steps:
- uses: actions/checkout@v4
with:
repository: metanorma/metanorma

- uses: metanorma/ci/inkscape-setup-action@main

- uses: metanorma/ci/ghostscript-setup-action@main

- uses: actions/download-artifact@v4
with:
path: pkg
Expand All @@ -164,6 +162,8 @@ jobs:
bundler: ${{ env.BUNDLER_VER }}
bundler-cache: true

- uses: metanorma/metanorma-build-scripts/inkscape-setup-action@main

- run: bundle exec rake
continue-on-error: ${{ matrix.experimental }}

Expand Down
10 changes: 9 additions & 1 deletion lib/ffi-libarchive-binary/libarchive_recipe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,15 @@
module LibarchiveBinary
class LibarchiveRecipe < MiniPortileCMake
ROOT = Pathname.new(File.expand_path("../..", __dir__))

#
# libarchive 3.7.x uses new GLIBC packaging ( links to libc only and not to pthread, dl, ...)
# this does not link work on Ubuntu 20 with GLIBC 3.21
#
# Cannot build 3.7.x on Ubuntu 22 either because it creates a reference to GLIB 3.22 (min) that does
# not resolve on Ubuntu 20
#
# So without patching we are stick to 3.6.2 until Ubuntu 20 shall be supported
#
def initialize
super("libarchive", "3.6.2")
@printed = {}
Expand Down
2 changes: 1 addition & 1 deletion lib/ffi-libarchive-binary/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module LibarchiveBinary
VERSION = "0.3.2"
VERSION = "0.3.2.rc1"
end

0 comments on commit 86b73d0

Please sign in to comment.