Skip to content

Commit

Permalink
Merge pull request #83 from tamatebako/feature/msys
Browse files Browse the repository at this point in the history
- MSys packaging for gems without native extensions (partial implementation #27)
- Ruby version upgrade to 2.7.7
- Bundler version upgrade to 2.3.22 -- we can address lutaml/expressir#106 now 
- Packaging optimization - Ruby extensions are not reconfigured on each tabako execution anymore (adresses #91)
  • Loading branch information
maxirmx authored Feb 14, 2023
2 parents 442aa85 + 4fda15b commit 6860392
Show file tree
Hide file tree
Showing 18 changed files with 857 additions and 398 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ tebako text eol=lf
*.sh text eol=lf
*.rb text eol=lf
*.gemspec text eol=lf
*.env text eol=lf
Gemspec text eol=lf
Rakefile text eol=lf
rails text eof=lf
90 changes: 43 additions & 47 deletions .github/workflows/alpine.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2021-2022 [Ribose Inc](https://www.ribose.com).
# Copyright (c) 2021-2023 [Ribose Inc](https://www.ribose.com).
# All rights reserved.
# This file is a part of tamatebako
#
Expand Down Expand Up @@ -45,26 +45,16 @@ on:
- .github/workflows/ubuntu.yml
workflow_dispatch:

concurrency:
group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
cancel-in-progress: true

env:
BUILD_TYPE: Release
# The folder for dwarfs and other dependenies
DEPS: deps
# GitHub dependencies'
INCBIN_TAG: "348e36b"
DWARFS_WR_TAG: "v0.2.1"
# Tarball dependencies
RUBY_VER: "2.7.5"
RUBY_HASH: "2755b900a21235b443bb16dadd9032f784d4a88f143d852bc5d154f22b8781f1"
# Bundler version
BUNDLER_VER: "2.3.15"
# Cache version
CACHE_VER: 10
CACHE_VER: 15
DEBIAN_FRONTEND: "noninteractive"
TZ: "Etc/UTC"

concurrency:
group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
cancel-in-progress: true
VERBOSE: yes

jobs:
setup:
Expand Down Expand Up @@ -98,17 +88,19 @@ jobs:
gdbm-dev yaml-dev yaml-static ncurses-dev ncurses-static \
readline-dev readline-static
- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: |
apk --no-cache --upgrade add clang
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
with:
fetch-depth: 1
submodules: true

- name: Setup environment
run: cat common.env >> $GITHUB_ENV

- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: apk --no-cache --upgrade add clang

- name: Patch system includes
if: ${{ matrix.env.CC == 'clang' }}
run: tools/ci-scripts/patch-system-includes.sh
Expand All @@ -130,7 +122,7 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ env.DEPS }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ matrix.env.CC }}-${{ env.DWARFS_WR_TAG }}-${{ env.INCBIN_TAG }}-${{ env.RUBY_HASH }}-v${{ env.CACHE_VER }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ env.CC }}-${{ hashFiles('**/common.env') }}-v${{ env.CACHE_VER }}

- name: tebako setup
run: bin/tebako setup
Expand Down Expand Up @@ -166,17 +158,19 @@ jobs:
gdbm-dev yaml-dev yaml-static ncurses-dev ncurses-static \
readline-dev readline-static
- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: |
apk --no-cache --upgrade add clang
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
with:
fetch-depth: 1
submodules: true

- name: Setup environment
run: cat common.env >> $GITHUB_ENV

- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: apk --no-cache --upgrade add clang

- name: Patch system includes
if: ${{ matrix.env.CC == 'clang' }}
run: tools/ci-scripts/patch-system-includes.sh
Expand All @@ -198,7 +192,7 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ env.DEPS }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ matrix.env.CC }}-${{ env.DWARFS_WR_TAG }}-${{ env.INCBIN_TAG }}-${{ env.RUBY_HASH }}-v${{ env.CACHE_VER }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ env.CC }}-${{ hashFiles('**/common.env') }}-v${{ env.CACHE_VER }}

- name: Cache check
if: steps.cache.outputs.cache-hit != 'true'
Expand All @@ -214,13 +208,10 @@ jobs:
fetch-depth: 1

- name: Run tebako tests (set no. 1)
# show cmake output aka verbose (yes/no)
env:
VERBOSE: yes
run: tests/scripts/functional-tests.sh

- name: Upload tebako test packages
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: test-packages
retention-days: 1
Expand Down Expand Up @@ -262,23 +253,26 @@ jobs:
gdbm-dev yaml-dev yaml-static ncurses-dev ncurses-static \
readline-dev readline-static ruby-dev p7zip
- name: Install bundler
run: gem install bundler

- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: apk --no-cache --upgrade add clang

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

- name: Setup environment
run: cat common.env >> $GITHUB_ENV

- name: Patch system includes
if: ${{ matrix.env.CC == 'clang' }}
run: tools/ci-scripts/patch-system-includes.sh

- name: Install bundler
run: gem install bundler

- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: apk --no-cache --upgrade add clang

- name: Build libjemalloc
run: |
wget -q https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2
Expand All @@ -296,7 +290,7 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ env.DEPS }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ matrix.env.CC }}-${{ env.DWARFS_WR_TAG }}-${{ env.INCBIN_TAG }}-${{ env.RUBY_HASH }}-v${{ env.CACHE_VER }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ env.CC }}-${{ hashFiles('**/common.env') }}-v${{ env.CACHE_VER }}

- name: Cache check
if: steps.cache.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -368,17 +362,19 @@ jobs:
readline-dev readline-static p7zip ruby-dev gcompat \
gettext-dev python3 pkgconfig gperf
- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: |
apk --no-cache --upgrade add clang
- name: Checkout tebako packaging environment
uses: actions/checkout@v3
with:
fetch-depth: 1
submodules: true

- name: Setup environment
run: cat common.env >> $GITHUB_ENV

- name: Install clang
if: ${{ matrix.env.CC == 'clang' }}
run: apk --no-cache --upgrade add clang

- name: Patch system includes
if: ${{ matrix.env.CC == 'clang' }}
run: tools/ci-scripts/patch-system-includes.sh
Expand All @@ -400,7 +396,7 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ env.DEPS }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ matrix.env.CC }}-${{ env.DWARFS_WR_TAG }}-${{ env.INCBIN_TAG }}-${{ env.RUBY_HASH }}-v${{ env.CACHE_VER }}
key: alpine-${{ matrix.env.ALPINE_VER }}-${{ env.CC }}-${{ hashFiles('**/common.env') }}-v${{ env.CACHE_VER }}

- name: Cache check
if: steps.cache.outputs.cache-hit != 'true'
Expand Down
Loading

0 comments on commit 6860392

Please sign in to comment.