From 222321648f6cae6a08d564897b1acd3cfe58dbf6 Mon Sep 17 00:00:00 2001 From: Joe Da Silva Date: Sun, 26 Jan 2025 22:57:11 -0800 Subject: [PATCH] try_console --- .github/workflows/main.yml | 90 ++++++++++++++++++++++++++++++++++++++ rpm/gimp3-fix-ca.spec.in | 5 +-- tests/Makefile.am | 2 +- 3 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..f51bad4 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,90 @@ +name: CI +on: [push,pull_request] + +jobs: + linux: + runs-on: ubuntu-latest + strategy: + matrix: + choiceL: [--disable-silent-rules, --enable-silent-rules, --enable-debugtime] + steps: + - uses: actions/checkout@v4 + - name: Create configure + run: | + sudo apt-get update -y + sudo apt-get install autoconf automake libtool gcc libgimp-3.0-dev + autoreconf -i + automake + - name: Choose configure + run: ./configure ${{ matrix.choiceL }} + - name: Make gimp-plugin-fix-ca + run: make + - name: Test make strip + if: matrix.choiceL == '--disable-silent-rules' + run: make strip + - name: Test user-level install/uninstall + if: matrix.choiceL == '--disable-silent-rules' + run: | + make install-user + make uninstall-user + - name: Test make install GIMP shared plugin + if: matrix.choiceL == '--disable-silent-rules' + run: | + sudo make install + sudo make uninstall + - name: Test make distcheck + if: matrix.choiceL == '--disable-silent-rules' + run: make distcheck + win: + runs-on: windows-latest + strategy: + matrix: + include: [ + {msystem: MINGW32, toolchain: mingw-w64-i686, version: x32 }, + {msystem: MINGW64, toolchain: mingw-w64-x86_64, version: x64 }, + {msystem: UCRT64, toolchain: mingw-w64-ucrt-x86_64, version: x64 }, + {msystem: CLANG64, toolchain: mingw-w64-clang-x86_64, version: x64 }, + ] + name: ${{ matrix.msystem }} + defaults: + run: + shell: msys2 {0} + steps: + - uses: actions/checkout@v4 + - uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.msystem }} + update: true + install: autotools base-devel git ${{ matrix.toolchain }}-toolchain ${{ matrix.toolchain }}-gimp3 ${{ matrix.toolchain }}-gettext-tools + - name: Create configure + run: | + autoreconf -i + automake + - name: run ./configure + run: ./configure + - name: Make gimp-fix-ca + run: make + local: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Create configure + run: | + sudo apt-get update -y + sudo apt-get install autoconf automake libtool gcc libgimp-3.0-dev + - name: Make local gimp-fix-ca install + run: gimptool-2.99 --install fix-ca.c + - name: Uninstall local gimp-fix-ca + run: gimptool-2.99 --uninstall-bin fix-ca + macos: + runs-on: macos-latest + steps: + - uses: actions/checkout@v4 + - name: Create configure + run: | + sudo port install gimp3-devel + sudo port install autoconf automake libtool gcc + - name: Make local gimp-fix-ca install + run: gimptool-2.99 --install fix-ca.c + - name: Uninstall local gimp-fix-ca + run: gimptool-2.99 --uninstall-bin fix-ca diff --git a/rpm/gimp3-fix-ca.spec.in b/rpm/gimp3-fix-ca.spec.in index 14f501c..cf552f6 100644 --- a/rpm/gimp3-fix-ca.spec.in +++ b/rpm/gimp3-fix-ca.spec.in @@ -43,9 +43,8 @@ autoreconf --force --install --verbose %build %make_build -#%check -#make check - +%check +make check %install %make_install INSTALLDIR="%{buildroot}/%{plugindir}" \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 163a484..f87bf21 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -41,7 +41,7 @@ update-test1: echo "rm -f ${builddir}/test1.bmp" >> ${builddir}/test1.sh; \ echo "${GIMPTOOL} --install-script ${builddir}/test-fix-ca.scm" >> ${builddir}/test1.sh; \ echo "${GIMPTOOL} --install-bin ${builddir}/test-fix-ca" >> ${builddir}/test1.sh; \ - echo "${GIMP} --verbose --console-messages -i --batch-interpreter plug-in-script-fu-eval -b '(test-fix-ca-scm RUN-NONINTERACTIVE)' -b '(gimp-quit 0)'" >> ${builddir}/test1.sh; \ + echo "gimp-console-3 --verbose --console-messages -i --batch-interpreter=plug-in-script-fu-eval -b '(test-fix-ca-scm RUN-NONINTERACTIVE)' -b '(gimp-quit 0)'" >> ${builddir}/test1.sh; \ echo "${GIMPTOOL} --uninstall-bin test-fix-ca" >> ${builddir}/test1.sh; \ echo "${GIMPTOOL} --uninstall-script test-fix-ca.scm" >> ${builddir}/test1.sh; \ echo "${MD5SUM} -c ${top_srcdir}/tests/test1.md5" >> ${builddir}/test1.sh; \