Merge pull request #150 from daschuer/master_merge

2.6: merge upstream master

.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml

@@ -35,7 +35,7 @@ body:
     id: logs
     attributes:
       label: Failure logs
-      description: The console output and all the logs metioned in the output
+      description: The console output and all the logs mentioned in the output.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/01-request-a-new-port.yml

@@ -1,5 +1,5 @@
 name: Request a new port
-description: Request a new port/library that vcpkg should support
+description: Request a new port/library that vcpkg should support.
 title: "[New Port Request] <library name here>"
 labels: ["category:new-port", "info:good-first-issue"]
 

.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml

@@ -1,5 +1,5 @@
 name: Request a feature or improvement to a port
-description: Suggest an improvement to one the the ports/libraries in vcpkg
+description: Suggest an improvement to one the the ports/libraries in vcpkg.
 title: "[<portname>] <short description of feature>"
 labels: ["category:port-feature"]
 body:

.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml

@@ -1,5 +1,5 @@
 name: Request a feature or improvement
-description: Suggest an improvement to vcpkg
+description: Suggest an improvement to vcpkg.
 title: ''
 labels: ["category:vcpkg-feature"]
 body:

.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md

@@ -1,6 +1,6 @@
 ---
 name: Other type of bug report
-about: Let us know about an issues that does not fit into any of the other issues
+about: Let us know about an issues that does not fit into any of the other issues.
   types
 title: ''
 labels: ''

.github/pull_request_template.md

@@ -1,12 +1,12 @@
 <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. -->
 
-<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/ -->
+<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. -->
 
 <!-- If this PR updates an existing port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
-- [ ] SHA512s are updated for each updated download
-- [ ] The "supports" clause reflects platforms that may be fixed by this new version
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
+- [ ] SHA512s are updated for each updated download.
+- [ ] The "supports" clause reflects platforms that may be fixed by this new version.
 - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.
 - [ ] Any patches that are no longer applied are deleted from the port's directory.
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
@@ -16,9 +16,9 @@ END OF PORT UPDATE CHECKLIST (delete this line) -->
 
 <!-- If this PR adds a new port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
 - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
-- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html)
+- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
 - [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
 - [ ] The license declaration in `vcpkg.json` matches what upstream says.
 - [ ] The installed as the "copyright" file matches what upstream says.

.github/workflows/build.yml

@@ -18,13 +18,13 @@ jobs:
             vcpkg_triplet: x64-windows
             vcpkg_host_triplet: x64-windows           
             check_disk_space: Get-PSDrive
-          - os: macos-12
+          - os: macos-13
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
             vcpkg_triplet: x64-osx-min1100
             vcpkg_host_triplet: x64-osx-min1100
             check_disk_space: df -h
-          - os: macos-12
+          - os: macos-13
             vcpkg_path: /Users/runner/mixxx-vcpkg
             vcpkg_bootstrap: ./bootstrap-vcpkg.sh
             vcpkg_triplet: arm64-osx-min1100-release
@@ -34,13 +34,13 @@ jobs:
       VCPKG_DEFAULT_TRIPLET: ${{ matrix.vcpkg_triplet }}
       VCPKG_DEFAULT_HOST_TRIPLET: ${{ matrix.vcpkg_host_triplet }}
       DEPS_BASE_NAME: mixxx-deps
-      DEVELOPER_DIR: /Applications/Xcode_13.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
       MIXXX_VERSION: 2.6
     name: ${{ matrix.vcpkg_triplet }}
     runs-on: ${{ matrix.os }}
     steps:
     - name: Check out git repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: mixxx-vcpkg
 
@@ -85,8 +85,8 @@ jobs:
     - name: "[macOS] Bootstrap vcpkg"
       if: runner.os == 'macOS'
       run: |
-          brew update && brew install nasm autoconf-archive
-          /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_13.1.app/Contents/Developer"
+          brew update && brew install nasm autoconf automake autoconf-archive
+          /bin/bash -c "sudo xcode-select --switch /Applications/Xcode_14.2.app/Contents/Developer"
           xcrun --show-sdk-version
 
     - name: Check available disk space
@@ -100,7 +100,7 @@ jobs:
       env:
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-      uses: azure/trusted-signing-action@v0.4.0
+      uses: azure/trusted-signing-action@v0.5.1
       with:
         azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -119,7 +119,7 @@ jobs:
       env:
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-      uses: azure/trusted-signing-action@v0.4.0
+      uses: azure/trusted-signing-action@v0.5.1
       with:
         azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -139,7 +139,7 @@ jobs:
       env:
         AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
       if: runner.os == 'Windows' && env.AZURE_TENANT_ID
-      uses: azure/trusted-signing-action@v0.4.0
+      uses: azure/trusted-signing-action@v0.5.1
       with:
         azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}

.github/workflows/check_issues.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             let issue_query = {
@@ -20,25 +20,65 @@ jobs:
               repo: context.repo.repo
             };
             let issue = await github.rest.issues.get(issue_query)
+            let issue_body = issue.data.body.replaceAll("\r\n", "\n");
+            let commentLabelClose = async (comment, label) => {
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: [label]});
+              await github.rest.issues.createComment({...issue_query, body: comment});
+              await github.rest.issues.update({...issue_query, state: "closed"});
+            }
 
             // missing-windows-sdk-issue
             let reg = /RC Pass 1: command "rc .*" failed \(exit code 0\) with the following output:/;
-            if (reg.test(issue.data.body)){
-              await github.rest.issues.removeAllLabels(issue_query);
-              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
+            if (reg.test(issue_body)){
               let body = "Thanks for posting this issue. Please make sure you have the following installed.\n" +
                          "- Visual Studio Desktop development with C++.\n" +
                          "- Windows 10 SDK or Windows 11 SDK.";
-              await github.rest.issues.createComment({...issue_query, body}); 
-              // Close the issue? 
+              return await commentLabelClose(body, "category:question");
             }
 
             // msys2 download fails => old vcpkg version
             reg = /error: https:\/\/repo\.msys2\.org\/.*: failed: status code 404/;
-            if (reg.test(issue.data.body)){
-              await github.rest.issues.removeAllLabels(issue_query);
-              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
+            if (reg.test(issue_body)){
               let body = "Try updating your vcpkg version via `git pull` to resolve this issue. MSYS2 downloads are removed from the upstream servers from time to time, so using an up-to-date vcpkg version is necessary."
-              await github.rest.issues.createComment({...issue_query, body}); 
-              // Close the issue? 
+              return await commentLabelClose(body, "category:question");
+            }
+
+            regs = []
+            // Issue text is: Copy issue body from .../issue_body.md
+            regs.push( /^Copy issue body from .*issue_body.md$/ );
+            // Issue to short like #36592 or #36668
+            regs.push( /^error: building.* BUILD_FAILED\r\nElapsed time.*\r\nPlease ensure.*(\r\nThen check .*\r\n.*)?$/ );
+            // Issues with only the default error message like #41813
+            regs.push( /^error: building.* BUILD_FAILED\r\n[\s\S]*issue_body.md$/ );
+            if (regs.some(reg => reg.test(issue_body))) {
+              let body = "Please see #30604 for how to report a build failure."
+              return await commentLabelClose(body, "requires:more-information");
+            }
+
+            // pkg-config/ not found issues like #36011
+            reg = /CMake Error at scripts\/cmake\/vcpkg_find_acquire_program.*\n(.*Please install it via your package manager:[\s\S]+)Call Stack/;
+            match = issue_body.match(reg)
+            if (match){
+              let body = "From the log:\n```\n" + match[1] + "```\n"
+              return await commentLabelClose(body, "category:question");
+            }
+
+            // MSVC internal compiler error like #36628
+            if (issue_body.indexOf("fatal error C1001: Internal compiler error") !== -1){
+              let body = "The build failed due to an internal compiler error. Please update your compiler or revert to an old version."
+              return await commentLabelClose(body, "category:question");
+            }
+
+            // configure: error: 'autoconf-archive' is missing like #37013
+            if (issue_body.indexOf("configure: error: 'autoconf-archive' is missing") !== -1){
+              let body = "Please install `autoconf-archive` via `brew install autoconf-archive` (macos) or `sudo apt-get install autoconf-archive` (linux)"
+              return await commentLabelClose(body, "category:question");
+            }
+
+            // Wrong formatted issues like #36086
+            const containsCopyHint = issue_body.indexOf("Copy issue body from") !== -1 || issue_body.indexOf("%2Fissue_body.md") !== -1;
+            if (containsCopyHint && issue_body.indexOf("```") === -1){
+              let body = "Please see #30604 for how to properly report a build failure."
+              return await github.rest.issues.createComment({...issue_query, body: body});
             }

.github/workflows/stale.yml

@@ -3,29 +3,33 @@ on:
   schedule:
     - cron: '30 1 * * *'
 
+permissions:
+  issues: write
+
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
           any-of-labels: 'category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 28
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           any-of-labels: 'category:new-port'
           close-issue-label: 'info:new-port-unresolved'
           days-before-issue-stale: 60
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 180
           days-before-pr-stale: -1
           days-before-close: 14
+          operations-per-run: 50

.github/workflows/test_modified_ports.yml

@@ -0,0 +1,23 @@
+name: Test Modified Ports
+on:
+  push:
+    branches:
+      - onboard-actions
+jobs:
+  Windows:
+    runs-on:
+      - self-hosted
+      - "1ES.Pool=vcpkg-windows-wus"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          # fetch-depth 50 tries to ensure we capture the whole history of the branch
+          fetch-depth: 50
+
+      - name: Bootstrap
+        run: ./bootstrap-vcpkg.sh
+
+      - name: Example
+        shell: pwsh
+        run: Write-Host 'Running on 1ES Hosted GitHub Runners'