expressir 1.4.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ca97d00cf87904a43da00c11fd799f2f039ad30dedec806962b68a264fc4a4a
-  data.tar.gz: a0030a32ed972e7c640cb13108e3fb296ce1482c155c34448bbe0fc23183158b
+  metadata.gz: 1eb8fca7617066f56f2141e4deadd8b34ac4e0cc8946268448446d6ce11adbb4
+  data.tar.gz: 96eb473f78ce645d22e21b8bb1c2887959e98874ea255024b7b13c48eddb05b6
 SHA512:
-  metadata.gz: 83358f3aeba231cf506b82b424c456f0b06fe021bb88081fe3addf7470066972101cb1badcb2318a5cc06bd439e620f9f61209a75505482b30329a0dd32edd94
-  data.tar.gz: a145308bade7bea532416b30d2e006b516f8442a614eb1ef42f2d55e66036761c6f023c6f908358c0a1c59c9212ca5d59857bff0eced1ba386a2710e243c8ac2
+  metadata.gz: 4e6ebf6461e38d58a6a979ffd22de3eebe48f3feda4c179f45ec2919605e1875768683f8a6ec019533f17543b936f72d6f20ceefddf695a60e4dca4675f06cb9
+  data.tar.gz: 1db94948d3012f7282f5f25ef5f7bfa83a236c9c1fdd42ec1fa07844600e43b89b8cf38955923cbca4c8f72db44131ba17ca7886b19d06946c4933430bf7c939

data/.github/workflows/codeql.yml

@@ -11,9 +11,6 @@ concurrency:
   group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
   cancel-in-progress: true
 
-env:
-  BUNDLER_VER: 2.4.22
-
 jobs:
   analyze:
     name: Analyze
@@ -22,26 +19,17 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       - name: Install Ruby
         uses: ruby/setup-ruby@master
         with:
-          ruby-version: 3.1
-          bundler: ${{ env.BUNDLER_VER }}
-          bundler-cache: false
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
+          ruby-version: 3.2
+          bundler-cache: true
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v2
         with:
           languages: "ruby, cpp"
 
-      - name: Build native extension
-        run: bundle exec rake compile
-
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2

data/.github/workflows/rake.yml

@@ -18,11 +18,6 @@ concurrency:
 
 env:
   RUBYGEM_VER: 3.4.22
-  BUNDLER_VER: 2.4.22
-# Forcing bundler version to ensure that it is consistent everywhere and
-# does not cause bundler gem reinstalls
-# bundler/rubygems 2.3.22 is a minimal requirement to support gnu/musl differentiation
-# https://github.com/rubygems/rubygems/pull/4488
 
 jobs:
   rubocop:
@@ -30,19 +25,13 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       - name: Install Ruby
-        uses: ruby/setup-ruby@master
+        uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.1
-          bundler: ${{ env.BUNDLER_VER }}
+          ruby-version: 3.2
           bundler-cache: true
 
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
       - name: Rubocop
         run: bundle exec rake rubocop
 
@@ -52,42 +41,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+        ruby: [ '3.3', '3.2', '3.1', '3.0', '2.7' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup packages
-        if: startsWith(matrix.os, 'macos')
-        run: brew install autoconf automake libtool
 
       - name: Install Ruby
-        uses: ruby/setup-ruby@master
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler: ${{ env.BUNDLER_VER }}
-          # Rice gem has issues with bundler cache
-          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
-          # but it is not the only issue
-          bundler-cache: false
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Process cache
-        uses: actions/cache@v4
-        id: cache
-        with:
-          path: lib/expressir/express/express_parser.*
-          key: v4-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express_parser/extconf.rb', 'ext/express_parser/antlrgen/**', 'ext/express_parser/express_parser.cpp', '.git/modules/ext/express_parser/antlr4-upstream/HEAD') }}
-
-      - name: Build native extension
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: bundle exec rake compile
+          bundler-cache: true
 
       - name: Run tests
         run: |
@@ -100,7 +65,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
+        ruby: [ '3.3', '3.2', '3.1', '3.0', '2.7' ]
     container: ruby:${{ matrix.ruby }}-alpine
     steps:
       - name: Install packages
@@ -109,8 +74,6 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
 
       - name: Upgrade RubyGems
         if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
@@ -121,328 +84,7 @@ jobs:
           git config --global --add safe.directory $PWD
           bundle install --jobs 4 --retry 3
 
-      - name: Process cache
-        uses: actions/cache@v4
-        id: cache
-        with:
-          path: lib/expressir/express/express_parser.*
-          key: v4-alpine-${{ matrix.ruby }}-${{ hashFiles('ext/express_parser/extconf.rb', 'ext/express_parser/antlrgen/**', 'ext/express_parser/express_parser.cpp', '.git/modules/ext/express_parser/antlr4-upstream/HEAD') }}
-
-      - name: Build native extension
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: bundle exec rake compile
-
       - name: Run tests
         run: |
           bundle exec rake
           cat .rspec_status
-
-  # test release workflow
-  pack-ruby:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@master
-        with:
-          ruby-version: '3.1'
-          bundler: ${{ env.BUNDLER_VER }}
-          bundler-cache: false
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Build gem without native extension
-        run: gem build expressir.gemspec
-
-      - name: Package gem without native extension
-        uses: actions/upload-artifact@v4
-        with:
-          name: pkg-ruby
-          path: expressir-*.gem
-
-  pack:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ linux-gnu, linux-musl, windows, darwin ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@master
-        with:
-          ruby-version: '3.1'
-          bundler-cache: false
-          bundler: ${{ env.BUNDLER_VER }}
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Enable swap
-        run: |
-          sudo fallocate -l 15g /compile.swap
-          sudo chmod 600 /compile.swap
-          sudo mkswap /compile.swap
-          sudo swapon /compile.swap
-          sudo swapon --all --verbose
-
-      - name: Build gem with native extension
-        run: bundle exec rake gem:${{ matrix.platform }}
-
-      - name: Package gem with native extension
-        uses: actions/upload-artifact@v4
-        with:
-          name: pkg-${{ matrix.platform }}
-          path: pkg/*.gem
-
-  verify-ruby:
-    name: verify ruby gem on ruby-${{ matrix.ruby }} ${{ matrix.os }}
-    needs: pack-ruby
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-    steps:
-      - name: Install Ruby
-        uses: ruby/setup-ruby@master
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: false
-          bundler: ${{ env.BUNDLER_VER }}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Download packaged gem
-        uses: actions/download-artifact@v4
-        with:
-         name: pkg-ruby
-         path: pkg
-
-      - name: Install gem
-        run: gem install -l pkg/expressir-*.gem
-
-      - name: Verify
-        run: |
-          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"
-
-  verify-ruby-linux-musl:
-    name: verify ruby gem on ruby-${{ matrix.ruby }} on alpine container
-    needs: pack-ruby
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
-    container: ruby:${{ matrix.ruby }}-alpine
-    steps:
-      - name: Install packages
-        run: |
-          apk --no-cache --upgrade add build-base git bash tar
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Upgrade RubyGems
-        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
-        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
-
-      - name: Bundle
-        run: |
-          git config --global --add safe.directory $PWD
-          bundle install --jobs 4 --retry 3
-
-      - name: Download packaged gem
-        uses: actions/download-artifact@v4
-        with:
-         name: pkg-ruby
-         path: pkg
-
-      - name: Install gem
-        run: gem install -l pkg/expressir-*.gem
-
-      - name: Verify
-        run: |
-          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"
-
-  verify-darwin:
-    name: verify MacOS binary gem on ruby-${{ matrix.ruby }}
-    needs: pack
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
-    steps:
-      - name: Install Ruby
-        uses: ruby/setup-ruby@master
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: false
-          bundler: ${{ env.BUNDLER_VER }}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Download packaged gem
-        uses: actions/download-artifact@v4
-        with:
-         name: pkg-darwin
-         path: pkg
-
-      - name: Install binary gem
-        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM.sub(/darwin\d{2}$/, 'darwin')").gem
-# MacOS with have something like x86_64-darwin19, others just x86_64-linux
-
-      - name: Verify
-        run: |
-          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"
-
-  verify-linux-gnu:
-    name: verify Linux (gnu) binary gem on ruby-${{ matrix.ruby }}
-    needs: pack
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
-    steps:
-      - name: Install Ruby
-        uses: ruby/setup-ruby@master
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: false
-          bundler: ${{ env.BUNDLER_VER }}
-
-      - name: Upgrade RubyGems
-        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
-        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Download packaged gem
-        uses: actions/download-artifact@v4
-        with:
-         name: pkg-linux-gnu
-         path: pkg
-
-      - name: Install binary gem
-        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM")-gnu.gem
-
-      - name: Verify
-        run: |
-          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"
-
-  verify-windows:
-    name: verify Windows binary gem on ruby-${{ matrix.ruby }}
-    needs: pack
-    continue-on-error: true
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
-    steps:
-      - name: Install Ruby
-        uses: ruby/setup-ruby@master
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: false
-          bundler: ${{ env.BUNDLER_VER }}
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Download packaged gem
-        uses: actions/download-artifact@v4
-        with:
-         name: pkg-windows
-         path: pkg
-
-      - name: Install binary gem
-        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM").gem
-
-      - name: Verify
-        run: |
-          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"
-
-  verify-linux-musl:
-    name: verify Linux (musl) binary gem on ruby-${{ matrix.ruby }}
-    needs: pack
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.2', '3.1', '3.0', '2.7' ]
-    container: ruby:${{ matrix.ruby }}-alpine
-    steps:
-      - name: Install packages
-        run: |
-          apk --no-cache --upgrade add build-base git bash tar
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Upgrade RubyGems
-        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
-        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
-
-      - name: Bundle
-        run: |
-          git config --global --add safe.directory $PWD
-          bundle install --jobs 4 --retry 3
-
-      - name: Download packaged gem
-        uses: actions/download-artifact@v4
-        with:
-         name: pkg-linux-musl
-         path: pkg
-
-      - name: Install binary gem
-        run: gem install -l pkg/expressir-*-$(ruby -e "puts RUBY_PLATFORM").gem
-
-      - name: Verify
-        run: |
-          cd $(ruby -e "puts Gem::Specification.find_by_name('expressir').gem_dir")
-          ruby bin/rspec
-          cat .rspec_status || echo ".rspec_status was not found"

data/.github/workflows/release.yml

@@ -5,185 +5,22 @@ on:
     inputs:
       next_version:
         description: |
-          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+          Next release version. Possible values: x.y.z, major, minor, patch (or pre|rc|etc).
+          Also, you can pass 'skip' to skip 'git tag' and do 'gem push' for the current version
         required: true
-        default: 'patch'
-  push:
-    tags: [ v* ]
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
-  cancel-in-progress: true
-
-env:
-  BUNDLER_VER: 2.4.22
+        default: 'skip'
+  repository_dispatch:
+    types: [ do-release ]
 
 jobs:
-  bump:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - uses: ruby/setup-ruby@master
-        with:
-          ruby-version: '3.1'
-          bundler: ${{ env.BUNDLER_VER }}
-
-      - if: ${{ github.event_name == 'workflow_dispatch' }} # unfortunatelly cannot keep this condition on job level
-        run: |
-          git config --global user.name github-actions
-          git config --global user.email github-actions@github.com
-          gem install gem-release
-          gem bump --version ${{ github.event.inputs.next_version }} --tag --push
-
-  pack:
-    runs-on: ubuntu-latest
-    needs: bump
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [ linux-gnu, linux-musl, windows, darwin ]
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          ref: main # https://github.com/actions/checkout/issues/439#issuecomment-830862188
-
-      - uses: ruby/setup-ruby@master
-        with:
-          ruby-version: '3.1'
-          # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
-          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
-
-      - run: bundle install --jobs 4 --retry 3
-
-      - name: Build gem and save version
-        if: matrix.platform == 'linux-gnu'
-        run: |
-          gem build expressir.gemspec | grep -o 'Version: .*' | awk '{print $2}' > version
-
-      - if: matrix.platform == 'linux-gnu'
-        uses: actions/upload-artifact@v4
-        with:
-          name: pkg-ruby
-          path: expressir-*.gem
-
-      - if: matrix.platform == 'linux-gnu'
-        uses: actions/upload-artifact@v4
-        with:
-          name: version
-          path: version
-
-      - name: Enable swap
-        run: |
-          sudo fallocate -l 15g /compile.swap
-          sudo chmod 600 /compile.swap
-          sudo mkswap /compile.swap
-          sudo swapon /compile.swap
-          sudo swapon --all --verbose
-
-      # build gem WITH pre-built native extension
-      - run: bundle exec rake gem:${{ matrix.platform }}
-
-      - uses: actions/upload-artifact@v4
-        with:
-          name: pkg-${{ matrix.platform }}
-          path: pkg/*.gem
-
-  publish:
-    runs-on: ubuntu-latest
-    needs: pack
-    steps:
-      - uses: actions/download-artifact@v4
-        with:
-          name: pkg-ruby
-          path: pkg
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: pkg-linux-gnu
-          path: pkg
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: pkg-linux-musl
-          path: pkg
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: pkg-windows
-          path: pkg
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: pkg-darwin
-          path: pkg
-
-      - uses: ruby/setup-ruby@master
-        with:
-          ruby-version: '3.1'
-
-      - name: Publish to rubygems.org
-        env:
-          RUBYGEMS_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
-        run: |
-          ls -l pkg/
-          mkdir -p ~/.gem
-          cat > ~/.gem/credentials << EOF
-          ---
-          :rubygems_api_key: ${RUBYGEMS_API_KEY}
-          EOF
-          chmod 0600 ~/.gem/credentials
-          gem signin
-          for gem in pkg/*.gem; do gem push $gem -V; done
-          sleep 15
-
-  verify:
-    name: Verify published gem on ${{ matrix.os }}
-    needs: publish
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-    steps:
-      - name: Install Ruby
-        uses: ruby/setup-ruby@master
-        with:
-          ruby-version: 3.1
-          bundler-cache: true
-          bundler: ${{ env.BUNDLER_VER }}
-
-      - name: Download version
-        uses: actions/download-artifact@v4
-        with:
-         name: version
-
-      - name: Install gem
-        run: gem install expressir -v $(cat version)
-
-      - name: Verify
-        run: expressir version
-
-  verify-alpine:
-    name: Verify published gem on alpine
-    needs: publish
-    runs-on: ubuntu-latest
-    container:
-      image: alpine:3.17
-    steps:
-      - name: Install packages
-        run: apk --no-cache add bash build-base git ruby-dev gcc g++ automake
-
-      - name: Download version
-        uses: actions/download-artifact@v4
-        with:
-         name: version
-
-      - name: Install gem
-        run: gem install expressir -v $(cat version)
+  release:
+    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+      release_command: rake release
+      bundler_cache: false
+      post_install: bundle install
+    secrets:
+      rubygems-api-key: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
+      pat_token: ${{ secrets.LUTAML_CI_PAT_TOKEN }}
 
-      - name: Verify
-        run: expressir version