Merge pull request #40 from increments/merge-upstream-v0.23.9

Merge upstream v0.23.9

Author: wataru86

.github/workflows/lint.yml

@@ -2,10 +2,6 @@ name: Linting
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
-  push:
-    branches:
-      - main
 
 jobs:
   test:
@@ -14,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: '3.0'
           bundler-cache: true # 'bundle install' and cache
       - name: Rubocop
         run: bundle exec rake rubocop

.github/workflows/tag_and_release.yml

@@ -0,0 +1,86 @@
+name: Tag and Release
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - c-api-stable
+    paths:
+      - "lib/qiita_marker/version.rb"
+
+jobs:
+  c_gem:
+    name: Compile C gem
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.1
+          bundler-cache: true
+
+      - name: Compile gem
+        run: bundle exec rake compile
+
+      - name: Build gem
+        run: bundle exec rake build
+
+      - name: Display structure of built gems
+        run: ls -R
+        working-directory: pkg/
+
+      - name: Publish to RubyGems
+        working-directory: pkg/
+        env:
+          GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_API_BOT_KEY}}
+        run: |
+          mkdir -p $HOME/.gem
+          touch $HOME/.gem/credentials
+          chmod 0600 $HOME/.gem/credentials
+          printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+          for i in *.gem; do
+            if [ -f "$i" ]
+            then
+              gem push "$i" || true
+            fi
+          done
+
+  release:
+    needs: ["c_gem"]
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Ruby 3.1
+        uses: ruby/setup-ruby@v1
+        with:
+          rubygems: latest
+          ruby-version: 3.1
+          bundler-cache: true
+
+      - name: Configure Git
+        run: |
+          git config --local user.email "actions@github.com"
+          git config --local user.name "Actions Auto Build"
+
+      - name: Get current version
+        id: version-label
+        run: |
+          VERSION=$(grep VERSION lib/qiita_marker/version.rb | head -n 1 | cut -d'"' -f2)
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+
+      - name: Create tag
+        run: |
+          git tag -a v${{ steps.version-label.outputs.version }} -m "Release v${{ steps.version-label.outputs.version }}"
+          git push origin --tags
+
+      - name: Publish release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release create v${{ steps.version-label.outputs.version }} --generate-notes

.github/workflows/test.yml

@@ -2,10 +2,6 @@ name: CI
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened]
-  push:
-    branches:
-      - production
 
 jobs:
   test:
@@ -16,7 +12,7 @@ jobs:
           - ubuntu-latest
           - macos-latest
           - windows-latest
-        ruby-version: [3.1, 3.0.0, 2.7.2]
+        ruby-version: [3.1, 3.0.6]
 
     runs-on: ${{ matrix.os }}
 

.rubocop.yml

@@ -6,7 +6,7 @@ inherit_gem:
     - config/minitest.yml
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Exclude:
     - "ext/**/*"
     - "vendor/**/*"

CHANGELOG.md

@@ -6,6 +6,9 @@
 
 ### Changed
 
+- Update base CommonMarker version to `v0.23.9`.
+- Drop Ruby 2.7 support
+
 ## 0.23.6.2 - 2022-11-18
 
 ### Changed

Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.7.2
+FROM ruby:3.0.6
 
 ENV RE2C_VERSION 1.3
 

Makefile

@@ -21,6 +21,3 @@ ext/qiita_marker/cmark-gfm_export.h: ext/qiita_marker/cmark-upstream/build/src/c
 
 ext/qiita_marker/cmark-gfm_version.h: ext/qiita_marker/cmark-upstream/build/src/cmark-gfm_version.h
 	cp $< $@
-
-ext/qiita_marker/cmark-gfm-extensions_export.h: ext/qiita_marker/cmark-upstream/build/extensions/cmark-gfm-extensions_export.h
-	cp $< $@

ext/qiita_marker/arena.c

@@ -68,15 +68,16 @@ static void *arena_calloc(size_t nmem, size_t size) {
   const size_t align = sizeof(size_t) - 1;
   sz = (sz + align) & ~align;
 
+  struct arena_chunk *chunk;
   if (sz > A->sz) {
-    A->prev = alloc_arena_chunk(sz, A->prev);
-    return (uint8_t *) A->prev->ptr + sizeof(size_t);
+    A->prev = chunk = alloc_arena_chunk(sz, A->prev);
+  } else if (sz > A->sz - A->used) {
+    A = chunk = alloc_arena_chunk(A->sz + A->sz / 2, A);
+  } else {
+    chunk = A;
   }
-  if (sz > A->sz - A->used) {
-    A = alloc_arena_chunk(A->sz + A->sz / 2, A);
-  }
-  void *ptr = (uint8_t *) A->ptr + A->used;
-  A->used += sz;
+  void *ptr = (uint8_t *) chunk->ptr + chunk->used;
+  chunk->used += sz;
   *((size_t *) ptr) = sz - sizeof(size_t);
   return (uint8_t *) ptr + sizeof(size_t);
 }
@@ -98,6 +99,6 @@ static void arena_free(void *ptr) {
 
 cmark_mem CMARK_ARENA_MEM_ALLOCATOR = {arena_calloc, arena_realloc, arena_free};
 
-cmark_mem *cmark_get_arena_mem_allocator() {
+cmark_mem *cmark_get_arena_mem_allocator(void) {
   return &CMARK_ARENA_MEM_ALLOCATOR;
 }