[Git][wxwidgets/wxwidgets][master] 5 commits: Add missing new line before the checksums

2 views
Skip to first unread message

Vadim Zeitlin (@_VZ_)

unread,
May 25, 2025, 12:08:21 PMMay 25
to wx-commi...@googlegroups.com

Vadim Zeitlin pushed to branch master at wxWidgets / wxWidgets

Commits:

  • 28eca2fd
    by Vadim Zeitlin at 2025-05-25T17:20:05+02:00 
    Add missing new line before the checksums

Just a minor cosmetic fix.

(cherry picked from commit 0f6dfb6369ae02fd45fb30ab6f2dd3c765229fdb)
  • 6e4ed39b
    by Vadim Zeitlin at 2025-05-25T17:20:05+02:00 
    Install Doxygen in MSW part of make_release workflow

Somehow it's not available by default any longer.

(cherry picked from commit 015e120fa82253118a5cae85fe760758ea925fdf)
  • 45a67cae
    by Vadim Zeitlin at 2025-05-25T17:20:55+02:00 
    Use node 20-based versions of the actions

Node 16 is not available on GitHub Actions any longer.

(cherry picked from commit c55004dcb2a130024c922e47a4ab933cbe859f76)
  • 2fd89451
    by Vadim Zeitlin at 2025-05-25T17:21:53+02:00 
    Use current upstream version of gh-release action

The problem that had been previously fixed in our fork should be fixed
upstream too by now.
  • b7341728
    by Vadim Zeitlin at 2025-05-25T17:39:27+02:00 
    Merge branch '3.3-release'

Update GitHub Actions workflow creating releases to work in the
current environment.

1 changed file:

Changes:

  • .github/workflows/make_release.yml
    ... ... @@ -35,15 +35,11 @@ jobs:
    35 35 
           - name: Create Archives Checksums
    36 36 
             working-directory: distrib/release/${{ inputs.version }}
    37 37 
             run: |
    38 
    -            printf '\n# THESE CHECKSUMS MUST BE MOVED ABOVE!\n\n````' >> ../../../docs/release.md
    38 
    +            printf '\n# THESE CHECKSUMS MUST BE MOVED ABOVE!\n\n````\n' >> ../../../docs/release.md
    39 39 
                 sha1sum * | tee -a ../../../docs/release.md
    40 40
    41 41 
           - name: Create Draft Release
    42 
    -        # Note: use a fork of softprops/action-gh-release which includes
    43 
    -        # https://github.com/softprops/action-gh-release/pull/254 fixing
    44 
    -        # updating the body of the draft releases. We should replace the SHA-1
    45 
    -        # with a tag when an upstream release including this fix is made.
    46 
    -        uses: vadz/action-gh-release@1460c8b8cca97de38c3557ca4a277b55f4971abc
    42 
    +        uses: softprops/action-g...@v2.2.2
    47 43 
             id: create_release
    48 44 
             with:
    49 45 
               name: wxWidgets ${{ inputs.version }}
    ... ... @@ -62,7 +58,7 @@ jobs:
    62 58 
           # because it can't be downloaded from a draft release without
    63 59 
           # impersonating the same user and I don't know how to do it.
    64 60 
           - name: Upload Release Archive
    65 
    -        uses: actions/upload-artifact@v3
    61 
    +        uses: actions/upload-artifact@v4
    66 62 
             with:
    67 63 
               name: wxWidgets-${{ inputs.version }}-source-archive
    68 64 
               path: distrib/release/${{ inputs.version }}/wxWidgets-${{ inputs.version }}.zip
    ... ... @@ -78,13 +74,14 @@ jobs:
    78 74 
             uses: actions/checkout@v4
    79 75
    80 76 
           - name: Download Release Archive
    81 
    -        uses: actions/download-artifact@v3
    77 
    +        uses: actions/download-artifact@v4
    82 78 
             with:
    83 79 
               name: wxWidgets-${{ inputs.version }}-source-archive
    84 80
    85 81 
           - name: Install Prerequisites
    86 82 
             run: |
    87 83 
                 choco install -y --no-progress graphviz html-help-workshop
    84 
    +            choco install -y doxygen.install --version=1.9.1
    88 85
    89 86 
           - name: Create MSW Installer and Help File
    90 87 
             shell: cmd
    ... ... @@ -92,7 +89,7 @@ jobs:
    92 89 
                 md distrib\release
    93 90 
                 md distrib\release\${{ inputs.version }}
    94 91 
                 move wxWidgets-${{ inputs.version }}.zip distrib\release\${{ inputs.version }}
    95 
    -            set "PATH=C:\Program Files (x86)\HTML Help Workshop;%PATH%"
    92 
    +            set "PATH=C:\Program Files\doxygen\bin;C:\Program Files (x86)\HTML Help Workshop;%PATH%"
    96 93 
                 build\tools\release.bat ${{ inputs.version }}
    97 94
    98 95 
           # This doesn't really decrease the file size but .chm files can't be
    ... ... @@ -109,7 +106,7 @@ jobs:
    109 106 
                 type ..\..\..\checksums
    110 107
    111 108 
           - name: Add Files to the Release
    112 
    -        uses: vadz/action-gh-release@1460c8b8cca97de38c3557ca4a277b55f4971abc
    109 
    +        uses: softprops/action-gh-release@v2.2.2
    113 110 
             with:
    114 111 
               name: wxWidgets ${{ inputs.version }}
    115 112 
               body_path: checksums

Reply all
Reply to author
Forward
0 new messages