Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update upstream repositories #123

Merged
merged 4 commits into from
Jan 31, 2024
Merged

Update upstream repositories #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2b27e8
Update upstream repositories
maxirmx Jan 30, 2024
98d60df
Update GHA actions' versions
maxirmx Jan 30, 2024
6033894
Use macos-12 runner for MacOS builds
maxirmx Jan 30, 2024
f8e6be2
Fixed brew prefix definition error
maxirmx Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-alpine/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ runs:

- name: Process cache
if: inputs.cache != 'off'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ inputs.cache_path }}
key: alpine-${{ env.ALPINE_VER }}-${{ env.CC }}-${{ hashFiles('*.env') }}-v${{ env.CACHE_VER }}
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/setup-macos/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ runs:
shell: bash
run: cat common.env >> $GITHUB_ENV

- name: Select XCode 12.4 & SDK 11.1
- name: Select XCode 13.1
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '12.4'
xcode-version: '13.1'

- name: Install packages
shell: bash
Expand Down Expand Up @@ -90,7 +90,7 @@ runs:

- name: Process cache
if: inputs.cache != 'off'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ inputs.cache_path }}
key: ${{ matrix.os }}-${{ env.CC }}-${{ hashFiles('*.env') }}-v${{ env.CACHE_VER }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-ubuntu/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ runs:

- name: Process cache
if: inputs.cache != 'off'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ inputs.cache_path }}
key: ${{ matrix.os }}-${{ env.CC }}-${{ hashFiles('*.env') }}-v${{ env.CACHE_VER }}
Expand Down
6 changes: 3 additions & 3 deletions .github/actions/test-package-metanorma/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ runs:
using: "composite"
steps:
- name: Checkout packed-mn
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: metanorma/packed-mn
path: ${{github.workspace}}/packed-mn

- name: Download gem
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: gem

Expand All @@ -49,7 +49,7 @@ runs:
run: echo "key=$(tebako hash)" >> $GITHUB_OUTPUT

- name: Process cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .tebako/deps
key: ${{ matrix.os }}-${{ env.CC }}-${{ matrix.package_ruby_ver }}-${{ steps.cache-key.outputs.key }}-${{ env.CACHE_VER }}
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/test-set-1/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ runs:
using: "composite"
steps:
- name: Checkout shell test framework
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: kward/shunit2
path: ${{github.workspace}}/tests/shunit2
Expand All @@ -46,7 +46,7 @@ runs:

- name: Upload tebako test packages
if: ${{ matrix.package_ruby_ver == env.RUBY_VER && env.CC == 'clang' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test-packages
retention-days: 1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/alpine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: apk --no-cache --upgrade add git bash

- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
run: apk --no-cache --upgrade add git bash

- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
run: apk --no-cache --upgrade add git bash

- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand All @@ -160,7 +160,7 @@ jobs:
image: alpine:latest
steps:
- name: Download test packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: test-packages

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/gem-test-and-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand All @@ -80,14 +80,14 @@ jobs:
run: bundle exec rake build

- name: Upload gem
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: gem
retention-days: 1
path: pkg/*

- name: Upload actions
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: actions
retention-days: 1
Expand All @@ -112,7 +112,7 @@ jobs:
run: apk --no-cache --upgrade add bash

- name: Download actions
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: actions
path: .github/actions
Expand All @@ -132,14 +132,14 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ macos-11.0 ]
os: [ macos-12 ]
package_ruby_ver: [ '3.1.4' ]
env:
- { CC: clang, CXX: clang++ }
env: ${{ matrix.env }}
steps:
- name: Download actions
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: actions
path: .github/actions
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
env: ${{ matrix.env }}
steps:
- name: Download actions
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: actions
path: .github/actions
Expand All @@ -188,7 +188,7 @@ jobs:
runs-on: ubuntu-latest
if: contains(github.ref, 'refs/tags/v') && !contains(github.ref, 'pre')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ludeeus/action-shellcheck@master
with:
ignore_paths: deps
Expand All @@ -45,7 +45,7 @@ jobs:
rubocop:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: ruby/setup-ruby@v1
with:
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ macos-11.0 ]
os: [ macos-12 ]
steps:
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand All @@ -86,11 +86,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ macos-11.0 ]
os: [ macos-12 ]
package_ruby_ver: [ '3.1.4', '3.2.3' ]
steps:
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand All @@ -111,11 +111,11 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ macos-11.0 ]
os: [ macos-12 ]
package_ruby_ver: [ '3.1.4', '3.2.3' ]
steps:
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand All @@ -131,12 +131,16 @@ jobs:
bundle install
RUBY_VER=${{ matrix.package_ruby_ver}} ruby ${{github.workspace}}/tests-2/tebako-test.rb

test-on-macos-latest:
cross-tests:
needs: tests-1
runs-on: macos-latest
strategy:
fail-fast: false
matrix:
os: [ macos-11, macos-13 ]
runs-on: ${{ matrix.os }}
steps:
- name: Download test packages
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: test-packages

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
env: ${{ matrix.env }}
steps:
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
env: ${{ matrix.env }}
steps:
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
env: ${{ matrix.env }}
steps:
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 1
submodules: true
Expand All @@ -148,7 +148,7 @@ jobs:
# runs-on: ubuntu-latest
# steps:
# - name: Download test packages
# uses: actions/download-artifact@v3
# uses: actions/download-artifact@v4
# with:
# name: test-packages
#
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/windows-msys.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ jobs:
# It may be version mismatch though (???)

- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -124,7 +124,7 @@ jobs:

- name: Process cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.DEPS }}
key: MSys-${{ env.CC }}-${{ hashFiles('**/common.env') }}-v${{ env.CACHE_VER }}
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
jemalloc:p

- name: Checkout tebako packaging environment
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -193,7 +193,7 @@ jobs:

- name: Process cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ env.DEPS }}
key: MSys-${{ env.CC }}-${{ hashFiles('**/common.env') }}-v${{ env.CACHE_VER }}
Expand All @@ -205,7 +205,7 @@ jobs:
false

- name: Checkout shell test framework
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: kward/shunit2
path: ${{github.workspace}}/tests/shunit2
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ elseif("${OSTYPE_TXT}" MATCHES "^darwin.*")
else(${RUBY_VER} VERSION_LESS "3.1.0")
set(OPENSSL_VER "3")
endif(${RUBY_VER} VERSION_LESS "3.1.0")
set(BUILD_OPENSSL_ROOT_DIR "${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
set(BUILD_OPENSSL_ROOT_DIR "${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
endif()

if(IS_DARWIN)
Expand Down Expand Up @@ -243,7 +243,7 @@ if(IS_MSYS)
endif(IS_MSYS)

def_ext_prj_g(INCBIN "348e36b")
def_ext_prj_g(DWARFS_WR "v0.4.0")
def_ext_prj_g(DWARFS_WR "v0.4.3")

find_library(_LIBNCURSES "libncurses.a")
if(${_LIBNCURSES} STREQUAL "_LIBNCURSES-NOTFOUND")
Expand Down Expand Up @@ -428,9 +428,9 @@ endif()
set(C_FLAGS_DEST cppflags)

if(IS_DARWIN)
string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BUILD_BREW_PREFIX}/opt/zlib/include -I${BUILD_BREW_PREFIX}/include")
string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BUILD_BREW_PREFIX}/opt/zlib/lib -L${BUILD_BREW_PREFIX}/lib")
set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BUILD_BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
string(CONCAT RUBY_C_FLAGS ${RUBY_C_FLAGS} " -I${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/include -I${BREW_PREFIX}/opt/zlib/include -I${BREW_PREFIX}/include")
string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -L${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}/lib -L${BREW_PREFIX}/opt/zlib/lib -L${BREW_PREFIX}/lib")
set(OPENSSL_RUBY_OPTION "--with-openssl-dir=${BREW_PREFIX}/opt/openssl@${OPENSSL_VER}")
set(C_FLAGS_DEST cflags)
else(IS_DARWIN)
string(CONCAT RUBY_L_FLAGS ${RUBY_L_FLAGS} " -static-libgcc")
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ In the future:
The Tebako packager is tested on the following platforms:

* Linux: Ubuntu 20.04; Alpine 3.17
* macOS: macOS 11.0 (Monterey)
* macOS: macOS 11 (Big Sur), 12 (Monterey), 13 (Ventura)
* Windows: TBD

== Supported Ruby versions
Expand Down
2 changes: 1 addition & 1 deletion common.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BUILD_TYPE=Release
DEPS=deps
INCBIN_TAG=348e36b
DWARFS_WR_TAG=v0.4.0
DWARFS_WR_TAG=v0.4.3
RUBY_VER=3.1.4
Loading