diff --git a/.github/workflows/README b/.github/workflows/README deleted file mode 100644 index 4e5f9713c7eca..0000000000000 --- a/.github/workflows/README +++ /dev/null @@ -1,7 +0,0 @@ -IMPORTANT - -All changes and/or additions to GitHub Workflows MUST be approved by the -Mozilla GitHub Enterprise Administrators Team. - -See https://mozilla-hub.atlassian.net/l/cp/f5ypVsa7 for contact information, or -reach out on Matrix: https://chat.mozilla.org/#/room/#github-admin:mozilla.org diff --git a/.github/workflows/close-pr.yml b/.github/workflows/close-pr.yml deleted file mode 100644 index a881cde247f6c..0000000000000 --- a/.github/workflows/close-pr.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: close pull request -on: - pull_request_target: - types: [opened, reopened] -jobs: - run: - runs-on: ubuntu-latest - steps: - - name: checkout - uses: actions/checkout@v4 - with: - sparse-checkout: "README.txt" - sparse-checkout-cone-mode: false - - name: close - env: - GH_TOKEN: ${{ github.token }} - PR: ${{ github.event.number }} - run: | - gh pr close ${{ env.PR }} --comment "(Automated Close) Please do not file pull requests here, see https://firefox-source-docs.mozilla.org/contributing/how_to_submit_a_patch.html" - gh pr lock ${{ env.PR }} diff --git a/js/public/experimental/LoggingInterface.h b/js/public/experimental/LoggingInterface.h index 9969a57d8eda2..5152e81a8912c 100644 --- a/js/public/experimental/LoggingInterface.h +++ b/js/public/experimental/LoggingInterface.h @@ -18,9 +18,9 @@ // MONGODB MODIFICATION: fmt version compatibility macro for Mongo v8.0 and below. #if defined(FMT_VERSION) && FMT_VERSION >= 80000 -# define JS_FORMAT_STRING(...) fmt::format_string<__VA_ARGS__> +# define FMT_FORMAT_STRING(...) fmt::format_string<__VA_ARGS__> #else -# define JS_FORMAT_STRING(...) fmt::string_view +# define FMT_FORMAT_STRING(...) fmt::string_view #endif struct JSContext; @@ -84,7 +84,7 @@ struct LoggingInterface { template void logPrintFmt(const OpaqueLogger aModule, mozilla::LogLevel aLevel, - JS_FORMAT_STRING(T...) aFmt, T&&... aArgs) { + FMT_FORMAT_STRING(T...) aFmt, T&&... aArgs) { JS::AutoSuppressGCAnalysis suppress; this->logPrintFMT(aModule, aLevel, aFmt, fmt::make_format_args(aArgs...)); } diff --git a/mfbt/StringBuffer.h b/mfbt/StringBuffer.h index eceb3b8e2448d..0565940f6a4d8 100644 --- a/mfbt/StringBuffer.h +++ b/mfbt/StringBuffer.h @@ -17,6 +17,7 @@ #include "mozilla/RefCounted.h" #include "mozmemory.h" // MONGODB MODIFICATION: Explicitly include Utility.h for arena allocation functions. +// Needed for backports to 8.0 and earlier due to clang-format header ordering changes (SERVER-105050). #include "js/Utility.h" namespace mozilla {