amc 1.5.0 -> 1.7.0, use upstream pango, use latest runners

See: #33

I've also fixed the warnings shown by 'brew style', and updated the GitHub Actions
using the command:

    brew tap-new maelvls/foo --github-packages

Author: maelvls

.github/workflows/publish.yml

@@ -1,33 +1,45 @@
 name: brew pr-pull
+
 on:
   pull_request_target:
     types:
       - labeled
+
 jobs:
   pr-pull:
     if: contains(github.event.pull_request.labels.*.name, 'pr-pull')
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    permissions:
+      actions: read
+      checks: read
+      contents: write
+      issues: read
+      packages: write
+      pull-requests: write
     steps:
       - name: Set up Homebrew
         uses: Homebrew/actions/setup-homebrew@master
+        with:
+          token: ${{ github.token }}
 
       - name: Set up git
         uses: Homebrew/actions/git-user-config@master
 
       - name: Pull bottles
         env:
           HOMEBREW_GITHUB_API_TOKEN: ${{ github.token }}
+          HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{ github.token }}
+          HOMEBREW_GITHUB_PACKAGES_USER: ${{ github.repository_owner }}
           PULL_REQUEST: ${{ github.event.pull_request.number }}
-        run: brew pr-pull --debug --tap=$GITHUB_REPOSITORY $PULL_REQUEST
+        run: brew pr-pull --debug --tap="$GITHUB_REPOSITORY" "$PULL_REQUEST"
 
       - name: Push commits
         uses: Homebrew/actions/git-try-push@master
         with:
-          token: ${{ github.token }}
           branch: main
 
       - name: Delete branch
         if: github.event.pull_request.head.repo.fork == false
         env:
           BRANCH: ${{ github.event.pull_request.head.ref }}
-        run: git push --delete origin $BRANCH
+        run: git push --delete origin "$BRANCH"

.github/workflows/tests.yml

@@ -1,57 +1,59 @@
 name: brew test-bot
+
 on:
   push:
     branches:
       - main
   pull_request:
+
 jobs:
   test-bot:
     strategy:
       matrix:
-        os:
-          # auto-multiple-choice: Re-enable Linux as soon as the qt@5 formula
-          # gets a bootle: https://github.com/Homebrew/linuxbrew-core/pull/23174
-          #
-          # amc-pango: installation fails on linux with the error:
-          #   /usr/bin/ld: cannot find -lintl
-          #   collect2: error: ld returned 1 exit status
-          # Remember to re-enable it one day.
-          #
-          # - ubuntu-latest
-          
-          # https://github.com/actions/virtual-environments/#available-environments
-          - macos-11
-          - macos-10.15
+        os: [ubuntu-24.04, macos-14, macos-15]
     runs-on: ${{ matrix.os }}
+    permissions:
+      actions: read
+      checks: read
+      contents: read
+      packages: read
+      pull-requests: read
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
+        with:
+          token: ${{ github.token }}
 
       - name: Cache Homebrew Bundler RubyGems
-        id: cache
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.set-up-homebrew.outputs.gems-path }}
-          key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
-          restore-keys: ${{ runner.os }}-rubygems-
-
-      - name: Install Homebrew Bundler RubyGems
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: brew install-bundler-gems
+          key: ${{ matrix.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
+          restore-keys: ${{ matrix.os }}-rubygems-
 
       - run: brew test-bot --only-cleanup-before
 
       - run: brew test-bot --only-setup
 
       - run: brew test-bot --only-tap-syntax
-
-      - run: brew test-bot --only-formulae
+      - name: Base64-encode GITHUB_TOKEN for HOMEBREW_DOCKER_REGISTRY_TOKEN
+        id: base64-encode
+        if: github.event_name == 'pull_request'
+        env:
+          TOKEN: ${{ github.token }}
+        run: |
+          base64_token=$(echo -n "${TOKEN}" | base64 | tr -d "\n")
+          echo "::add-mask::${base64_token}"
+          echo "token=${base64_token}" >> "${GITHUB_OUTPUT}"
+      - run: brew test-bot --only-formulae --root-url='https://ghcr.io/v2/${{ github.repository }}'
         if: github.event_name == 'pull_request'
+        env:
+          HOMEBREW_DOCKER_REGISTRY_TOKEN: ${{ steps.base64-encode.outputs.token }}
 
       - name: Upload bottles as artifact
         if: always() && github.event_name == 'pull_request'
-        uses: actions/upload-artifact@main
+        uses: actions/upload-artifact@v4
         with:
-          name: bottles
+          name: bottles_${{ matrix.os }}
           path: "*.bottle.*"

auto-multiple-choice.rb Formula/auto-multiple-choice.rbauto-multiple-choice.rb renamed to Formula/auto-multiple-choice.rb

@@ -1,9 +1,8 @@
 class AutoMultipleChoice < Formula
   desc "Printable tests for students with OCR marking"
   homepage "https://www.auto-multiple-choice.net"
-  url "https://gitlab.com/jojo_boulix/auto-multiple-choice/uploads/3262cbab3161e5e63239a281e9a2ce23/auto-multiple-choice_1.5.0_dist.tar.gz"
-  sha256 "2e48ebb11a215c7882212c46f31d9013bb488c32899104008b0840e67f716948"
-  revision 0
+  url "https://download.auto-multiple-choice.net/amc_1.7.0_dist.tar.gz"
+  sha256 "dfb916aa076f668a6f35253a2c0fc5998db07d2273deb45295a405d8749b7660"
 
   bottle do
     root_url "https://github.com/maelvls/homebrew-amc/releases/download/auto-multiple-choice-1.5.0"
@@ -25,19 +24,21 @@ class AutoMultipleChoice < Formula
   depends_on "librsvg" => :build
   depends_on "make" => :build # macOS system make (3.81) breaks vars-subs.pl
   depends_on "adwaita-icon-theme"
-  depends_on "amc-pango"
   depends_on "cairo"
+  depends_on "expat"
   depends_on "freetype"
   depends_on "gettext"
   depends_on "glib"
   depends_on "gobject-introspection"
   depends_on "gtk+3"
+  depends_on "harfbuzz"
   depends_on "imagemagick@6"
   depends_on "libffi"
   depends_on "libx11"
   depends_on "netpbm"
-  depends_on "opencv" # vendored Pango, stuck at v1.42.4
+  depends_on "opencv"
   depends_on "openssl@3" # required by Net::SSLeay
+  depends_on "pango"
   depends_on "perl"
   depends_on "poppler"
   depends_on "qpdf"
@@ -451,7 +452,7 @@ def install
     ENV.prepend_path "PATH", Formula["gobject-introspection"].bin
     ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["libffi"].lib}/pkgconfig" # for Glib::Object::Introspection
     ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["gobject-introspection"].lib}/pkgconfig" # Same
-    ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["amc-pango"].lib}/pkgconfig" # for Pango & AMC-buildpdf
+    ENV.prepend_path "PKG_CONFIG_PATH", "#{Formula["pango"].lib}/pkgconfig" # for Pango & AMC-buildpdf
 
     ENV["OPENSSL_PREFIX"] = Formula["openssl@3"].prefix.to_s
     ENV["PERL_MM_OPT"] = "INSTALL_BASE=#{libexec}" # for cpan (Makefile.PL)
@@ -502,8 +503,8 @@ def install
     (bin/"auto-multiple-choice").write_env_script libexec/"bin/auto-multiple-choice",
         PERL5LIB:   ENV["PERL5LIB"],
         # netpbm, poppler and imagemagick@6 must be in the PATH
-        PATH:       "#{libexec}/bin:#{Formula["qpdf"].bin}:#{Formula["netpbm"].bin}"\
-                    ":#{Formula["poppler"].bin}:#{Formula["imagemagick@6"].bin}"\
+        PATH:       "#{libexec}/bin:#{Formula["qpdf"].bin}:#{Formula["netpbm"].bin}" \
+                    ":#{Formula["poppler"].bin}:#{Formula["imagemagick@6"].bin}" \
                     ":#{Formula["gobject-introspection"].bin}:$PATH",
         AMCBASEDIR: prefix