Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mediawiki to 1.39.7 #439

Merged
merged 13 commits into from Apr 26, 2024
Merged

Update mediawiki to 1.39.7 #439

merged 13 commits into from Apr 26, 2024

Conversation

deer-wmde
Copy link
Contributor

@deer-wmde
Copy link
Contributor Author

currently investigating why the MediaWiki Verify CI check is failing. Comparison of the responses via docker compose:
https://phabricator.wikimedia.org/P61095 vs https://phabricator.wikimedia.org/P61096

@deer-wmde
Copy link
Contributor Author

seems to be related to some change in the Math extension: https://github.com/wbstack/mediawiki/pull/439/files#diff-9ed2b2e3b9657cb4a1d52bfb247b0c11d6b0cc8523911de3632c9f791a054bb2

{
  "id": "a4c957e6698c95e98f42432a",
  "type": "ErrorException",
  "file": "/var/www/html/w/includes/Rest/Router.php",
  "line": 186,
  "message": "PHP Warning: filemtime(): stat failed for /var/www/html/w//var/www/html/w/extensions/Math/popupRestRoutes.json",
  "code": 0,
  "url": "/w/rest.php",
  "caught_by": "mwe_handler",
  "backtrace": [
    {
      "function": "handleError",
      "class": "MWExceptionHandler",
      "type": "::",
      "args": [
        "integer",
        "string",
        "string",
        "integer",
        "array"
      ]
    },
    {
      "file": "/var/www/html/w/includes/Rest/Router.php",
      "line": 186,
      "function": "filemtime",
      "args": [
        "string"
      ]
    },
    {
      "file": "/var/www/html/w/includes/Rest/Router.php",
      "line": 221,
      "function": "getRoutesFromFiles",
      "class": "MediaWiki\\Rest\\Router",
      "type": "->",
      "args": []
    },
    {
      "file": "/var/www/html/w/includes/Rest/Router.php",
      "line": 240,
      "function": "getAllRoutes",
      "class": "MediaWiki\\Rest\\Router",
      "type": "->",
      "args": []
    },
    {
      "file": "/var/www/html/w/includes/Rest/Router.php",
      "line": 363,
      "function": "getMatchers",
      "class": "MediaWiki\\Rest\\Router",
      "type": "->",
      "args": []
    },
    {
      "file": "/var/www/html/w/includes/Rest/EntryPoint.php",
      "line": 170,
      "function": "execute",
      "class": "MediaWiki\\Rest\\Router",
      "type": "->",
      "args": [
        "MediaWiki\\Rest\\RequestFromGlobals"
      ]
    },
    {
      "file": "/var/www/html/w/includes/Rest/EntryPoint.php",
      "line": 135,
      "function": "execute",
      "class": "MediaWiki\\Rest\\EntryPoint",
      "type": "->",
      "args": []
    },
    {
      "file": "/var/www/html/w/rest.php",
      "line": 35,
      "function": "main",
      "class": "MediaWiki\\Rest\\EntryPoint",
      "type": "::",
      "args": []
    }
  ],
  "@type": "type.googleapis.com/google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent",
  "severity": "error",
  "serviceContext": {
    "service": "WBaaS MediaWiki",
    "version": "1.0.0"
  }
}

wikiman.yaml Outdated
@@ -72,6 +72,7 @@ extensions:
repoName: wikimedia/mediawiki-extensions-Kartographer
- name: Math
repoName: wikimedia/mediawiki-extensions-Math
repoRef: 2822d35380c87960c56111be025fd2c5817e919e
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I read your comment and the ticket but TBH I failed to understand why we need to pin back to this version; would we be better to either add a patch or actually backport the change to the repo upstream?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Solely to prioritize the deployment of the security fix, that cleanup can happen in a follow up PR IMO

Copy link
Contributor Author

@deer-wmde deer-wmde Apr 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

using up-to-date code resolved this

wikiman.yaml Outdated Show resolved Hide resolved
Copy link
Contributor

@tarrow tarrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fantastic to me; I'm happy that generally "unpinning" and using master/main of everything where possible seems to be a pattern that's working. Thanks so much for the continued effort to get this over the line!

@deer-wmde
Copy link
Contributor Author

Looks fantastic to me; I'm happy that generally "unpinning" and using master/main of everything where possible seems to be a pattern that's working. Thanks so much for the continued effort to get this over the line!

Yeah I'm also glad that resolved it, thanks for pointing me in the right direction!

@deer-wmde deer-wmde merged commit 4050003 into main Apr 26, 2024
9 checks passed
@deer-wmde deer-wmde deleted the de/1.39.7 branch April 26, 2024 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants