[setup-r]: macOS: unlink pre-installed pkg-config (#953)

* Add debug to R-devel workflow

[ci skip]

* Include brew output

[ci skip]

* macOS: try to unlink pre-installed pkg-config

It conflicts with the new pkgconf version that
we are trying to install, and which should be
the default going forward.

#948

* Update NEWS

* Update npm deps for setup-r

Removed source map, for CodeQL.
I can't please it otherwise...

* Still need older ncc

Hopefully this'll be enough.

* Patch generated file manually

Wow.

* Hand-edit generated file for CodeQL

.github/workflows/r-devel-test.yaml

@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macos-14,       r: 'devel'}
+          - {os: macos-15,       r: 'devel'}
           - {os: macos-latest,   r: 'devel'}
           - {os: windows-latest, r: 'devel'}
           - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
@@ -36,6 +36,8 @@ jobs:
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
 
+      - uses: r-hub/actions/debug-shell@v1
+
       - uses: ./setup-pandoc
 
       - uses: ./setup-r

NEWS.md

@@ -1,3 +1,8 @@
+# `v2.11.1` (2024-11-25)
+
+* `[setup-r]` now unlinks the pre-installed pkg-config brew package
+  to fix a clash with the new pkgconf package (#948).
+
 # `v2.11.0` (2024-11-09)
 
 * `[setup-r-dependencies]` parameter `pak-version` can now be `repo` or

setup-r/package.json

@@ -5,7 +5,7 @@
   "description": "R setup action",
   "main": "src/setup-r.ts",
   "scripts": {
-    "build": "ncc build --source-map --minify",
+    "build": "ncc build --minify",
     "format": "prettier --write **/*.ts",
     "format-check": "prettier --check **/*.ts"
   },
@@ -34,7 +34,7 @@
   "devDependencies": {
     "@types/node": "^20.12.10",
     "prettier": "^3.2.5",
-    "@vercel/ncc": "^0.38.1",
+    "@vercel/ncc": "^0.37.x",
     "typescript": "^5.4.5"
   }
 }

setup-r/src/installer.ts

@@ -250,6 +250,17 @@ async function acquireFortranMacOSOld(): Promise<string> {
 
 async function acquireUtilsMacOS() {
   // qpdf is needed by `--as-cran`
+  // https://github.com/r-lib/actions/issues/948
+  try {
+    process.env.HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK = "true";
+    await exec.exec(
+      "brew",
+	[ "unlink", "pkg-config@0.29.2" ],
+	{ silent: false }
+    );
+  } catch (error) {
+    // ignore error, in case it is not pre-installed in the future
+  }
   try {
     process.env.HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK = "true";
     await exec.exec("brew", [
@@ -258,7 +269,7 @@ async function acquireUtilsMacOS() {
       "pkgconfig",
       "checkbashisms",
       "ghostscript",
-    ], { silent: true });
+    ], { silent: false });
   } catch (error) {
     core.debug(`${error}`);