diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 84b901f..b12b232 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -25,8 +25,8 @@ jobs: - '5.38' node: - - '16.x' - - '18.x' + - '20.x' + - '21.x' exclude: - os: ubuntu-18.04 @@ -41,10 +41,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Setup Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} @@ -55,14 +55,14 @@ jobs: - name: CPAN Cache id: cpan-cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: thirdparty key: ${{ matrix.os }}-cpan-${{ matrix.perl }}-${{ hashFiles('**/Makefile.PL') }}-${{ hashFiles('**/cpanfile') }} - name: Node Cache id: node-cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: node_modules key: ${{ matrix.os }}-node-${{ matrix.node }}-${{ hashFiles('**/package.json') }} @@ -97,7 +97,6 @@ jobs: ln -s ../../../thirdparty/bin thirdparty/carton/bin mkdir -p ../node_modules ln -s ../../node_modules frontend/node_modules - cp etc/my-callbackery-app.dist.yaml etc/my-callbackery-app.yaml ./configure make || make diff --git a/lib/Mojolicious/Command/Author/generate/automake_app/.github/workflows/build-release.yaml b/lib/Mojolicious/Command/Author/generate/automake_app/.github/workflows/build-release.yaml index 9726b80..257971a 100644 --- a/lib/Mojolicious/Command/Author/generate/automake_app/.github/workflows/build-release.yaml +++ b/lib/Mojolicious/Command/Author/generate/automake_app/.github/workflows/build-release.yaml @@ -10,17 +10,17 @@ jobs: matrix: fail-fast: false include: - - ubuntu: 18.04 - docker_file: Dockerfile - image_version_tag: '18.04' - ubuntu: 20.04 docker_file: Dockerfile - image_version_tag: '18.04' + image_version_tag: '20.04' + - ubuntu: 22.04 + docker_file: Dockerfile + image_version_tag: '22.04' runs-on: ubuntu-latest name: Build package defined in ${{ matrix.docker_file }} for tag {{$matrix.image_version_tag}} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Run docker build id: build_package uses: ./.github/actions/build-release-action @@ -34,6 +34,3 @@ jobs: files: ${{ github.workspace }}/${{ steps.build_package.outputs.package_name }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - diff --git a/lib/Mojolicious/Command/Author/generate/automake_app/Makefile.am b/lib/Mojolicious/Command/Author/generate/automake_app/Makefile.am index 66c2cb2..7d1cbda 100644 --- a/lib/Mojolicious/Command/Author/generate/automake_app/Makefile.am +++ b/lib/Mojolicious/Command/Author/generate/automake_app/Makefile.am @@ -32,7 +32,7 @@ clean-local: LANGUAGES := $(shell $(PERL) -e 'use JSON::PP qw(decode_json); print join(" ", map {"share/".$$_.".po"} @{decode_json(join("",<>))->{locales}})' frontend/compile.json) CALLBACKERY_PM := $(shell find thirdparty/lib/perl5/CallBackery -name "*.pm") -share/messages.pot: $(PM) $(CALLBACKERY_PM) +share/messages.pot: $(PM) $(CALLBACKERY_PM) Makefile.am mkdir -p share $(XGETTEXT) -s --language=perl --package-name=$(PACKAGE) --package-version=$(VERSION) --from-code=UTF-8 --keyword=trm:1 --output=share/messages.pot $(PM) $(CALLBACKERY_PM) sed -i 's/; charset=CHARSET/; charset=UTF-8/' share/messages.pot diff --git a/lib/Mojolicious/Command/Author/generate/automake_app/configure.ac b/lib/Mojolicious/Command/Author/generate/automake_app/configure.ac index 18ad674..4dc6f38 100644 --- a/lib/Mojolicious/Command/Author/generate/automake_app/configure.ac +++ b/lib/Mojolicious/Command/Author/generate/automake_app/configure.ac @@ -65,23 +65,17 @@ fi % if ($package eq 'callbackery' ) { -ac_node_version="10" +ac_node_version="20" -if test -x "$NODE"; then - AC_MSG_CHECKING(make sure we have at least node ${ac_node_version}) - case `$NODE --version` in - v16*) - AC_MSG_RESULT(ok v16) - ;; - v18*) - AC_MSG_RESULT(ok v18) - ;; - *) - AC_MSG_RESULT(no); - NODE=old-node - esac +AC_MSG_CHECKING(for node version greater than or equal to $ac_node_version) +if $PERL -e 'if (`'$NODE' --version` =~ /v(\d+)/ and $1 >= '$ac_node_version') { exit 1 }'; then + NODE=old-node-found + AC_MSG_RESULT(at least version ${ac_node_version} is required to re-build the fontend) +else + AC_MSG_RESULT(ok); fi + AM_CONDITIONAL(BUILD_QOOXDOO_APP,[test -x $NODE]) % } diff --git a/lib/Mojolicious/Command/Author/generate/automake_app/lib/Makefile.am b/lib/Mojolicious/Command/Author/generate/automake_app/lib/Makefile.am index 8b1d180..9eb35e1 100644 --- a/lib/Mojolicious/Command/Author/generate/automake_app/lib/Makefile.am +++ b/lib/Mojolicious/Command/Author/generate/automake_app/lib/Makefile.am @@ -1,4 +1,4 @@ -PM := $(shell find . -type d -name ".??*" -prune -o -not -name ".*" -a -not -name "*~" -a -not -name "*.tmp" -a -not -name "Makefile*" -a -type f -print ) +PM := $(shell find -L . -type d -name ".??*" -prune -o -not -name ".*" -a -not -name "*~" -a -not -name "*.tmp" -a -not -name "Makefile*" -a -type f -print ) EXTRA_DIST = $(PM) datadir = $(libdir) nobase_data_DATA = $(PM) diff --git a/lib/Mojolicious/Command/Author/generate/callbackery_app/cpanfile b/lib/Mojolicious/Command/Author/generate/callbackery_app/cpanfile index 12c9923..6c1ada8 100644 --- a/lib/Mojolicious/Command/Author/generate/callbackery_app/cpanfile +++ b/lib/Mojolicious/Command/Author/generate/callbackery_app/cpanfile @@ -1,2 +1,2 @@ -requires 'CallBackery', '>= 0.35.0'; +requires 'CallBackery', '>= 0.49.0'; requires 'Mojo::SQLite'; diff --git a/lib/Mojolicious/Command/Author/generate/callbackery_app/frontend/compile.js b/lib/Mojolicious/Command/Author/generate/callbackery_app/frontend/compile.js index 99a054e..21ca5ec 100644 --- a/lib/Mojolicious/Command/Author/generate/callbackery_app/frontend/compile.js +++ b/lib/Mojolicious/Command/Author/generate/callbackery_app/frontend/compile.js @@ -8,7 +8,7 @@ qx.Class.define("callbackery.compile.CompilerApi", { } let cbr = process.env.CALLBACKERY_QX; if (cbr) { - ["callbackery","uploadwidget"].forEach(dir => { + ["callbackery"].forEach(dir => { config.libraries.push(cbr+"/"+dir); });