diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cded2a8..f8082d3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,9 +6,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - uses: gleam-lang/setup-erlang@v1.1.0 + - uses: erlef/setup-beam@v1 with: - otp-version: 22.3 + otp-version: 24.3 - name: Dialyzer run: rebar3 dialyzer @@ -25,10 +25,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - otp: [21.3, 22.3, 23.0.1] + otp: [23.3] steps: - uses: actions/checkout@v2 - - uses: gleam-lang/setup-erlang@v1.1.0 + - uses: erlef/setup-beam@v1 with: otp-version: ${{matrix.otp}} - name: Compile @@ -40,10 +40,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - otp: [21.3, 22.3, 23.0.1] + otp: [23.3] steps: - uses: actions/checkout@v2 - - uses: gleam-lang/setup-erlang@v1.1.0 + - uses: erlef/setup-beam@v1 with: otp-version: ${{matrix.otp}} - name: Compile @@ -54,18 +54,19 @@ jobs: env: RE2_DEBUG: 1 - test-macos: - runs-on: macos-latest - strategy: - matrix: - otp: ["erlang@21", "erlang@22", "erlang"] - steps: - - uses: actions/checkout@v2 - - run: brew install ${{matrix.otp}} rebar3 - - name: Compile - run: rebar3 compile - - name: Run tests - run: rebar3 eunit + # There is an issue with triq which prevents these tests from running ... + # test-macos: + # runs-on: macos-latest + # strategy: + # matrix: + # otp: ["erlang@22", "erlang@23"] + # steps: + # - uses: actions/checkout@v2 + # - run: brew install ${{matrix.otp}} rebar3 + # - name: Compile + # run: rebar3 compile + # - name: Run tests + # run: rebar3 eunit test-windows: runs-on: windows-2016 diff --git a/c_src/build_deps.sh b/c_src/build_deps.sh index ddf7edb..b601c0c 100755 --- a/c_src/build_deps.sh +++ b/c_src/build_deps.sh @@ -29,7 +29,7 @@ case "$1" in fi test -f re2/$LIBRE2 && exit 0 - RE2_REV=${RE2_REV:-2021-02-02} + RE2_REV=${RE2_REV:-2022-06-01} case $(git config --get remote.origin.url) in git@github.com*|https://github.com*|git://github.com*) RE2_DEFAULT_URL=https://github.com/google/re2 diff --git a/rebar.config.script b/rebar.config.script index 8a83c61..75829e8 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -164,7 +164,7 @@ PortOpts = fun() -> end. %% PCDep = {pc, {git, "https://github.com/blt/port_compiler", {tag, "v1.11.0"}}}. -PCDep = pc. +PCDep = {pc, "1.14.0"}. %% TestDeps = [{triq, ".*", %% {git, "https://gitlab.com/triq/triq.git", {branch, "master"}}}]. TestDeps = [triq]. diff --git a/src/re2.app.src b/src/re2.app.src index 6a373ce..4c1b7b9 100644 --- a/src/re2.app.src +++ b/src/re2.app.src @@ -1,6 +1,6 @@ {application, re2, [ {description, "Erlang NIF bindings for RE2 regex library"} - , {vsn, "1.9.7"} + , {vsn, "1.9.8"} , {modules, [re2]} , {registered, []} , {applications, [ kernel