diff --git a/.ci/Dockerfile.2022 b/.ci/Dockerfile.2022 deleted file mode 100644 index 6fa175e..0000000 --- a/.ci/Dockerfile.2022 +++ /dev/null @@ -1,13 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:ltsc2022 - -COPY ./msys2-base-x86_64-latest.sfx.exe /msys2.exe - -RUN powershell -Command \ - $ErrorActionPreference = 'Stop'; \ - $ProgressPreference = 'SilentlyContinue'; \ - /msys2.exe -y -oC:\; \ - function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \ - msys ' '; \ - msys 'pacman --noconfirm -Syuu'; \ - msys 'pacman --noconfirm -Syuu'; \ - msys 'pacman --noconfirm -Scc'; diff --git a/.ci/Dockerfile.2025 b/.ci/Dockerfile.2025 deleted file mode 100644 index d1cf102..0000000 --- a/.ci/Dockerfile.2025 +++ /dev/null @@ -1,13 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:ltsc2025 - -COPY ./msys2-base-x86_64-latest.sfx.exe /msys2.exe - -RUN powershell -Command \ - $ErrorActionPreference = 'Stop'; \ - $ProgressPreference = 'SilentlyContinue'; \ - /msys2.exe -y -oC:\; \ - function msys() { C:\msys64\usr\bin\bash.exe @('-lc') + @Args; } \ - msys ' '; \ - msys 'pacman --noconfirm -Syuu'; \ - msys 'pacman --noconfirm -Syuu'; \ - msys 'pacman --noconfirm -Scc'; diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index 1f781f3..0000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,244 +0,0 @@ -name: 'build' - -on: - push: - pull_request: - workflow_dispatch: - schedule: - - cron: '0 3 * * *' - -concurrency: nope -permissions: - contents: read - -jobs: - zizmor: - runs-on: ubuntu-24.04 - - permissions: - contents: read - security-events: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - persist-credentials: false - - - name: Run zizmor - run: pipx run zizmor . - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - build-installer: - runs-on: windows-${{ matrix.image }} - strategy: - fail-fast: false - matrix: - include: - - msystem: CLANGARM64 - arch_name: arm64 - image: 11-arm - - msystem: CLANG64 - arch_name: x86_64 - image: 2022 - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - persist-credentials: false - - - name: setup-msys2 - uses: msys2/setup-msys2@v2 # zizmor: ignore[unpinned-uses] - with: - msystem: ${{ matrix.msystem }} - update: true - install: >- - tar - pacboy: >- - qt-installer-framework:p - 7zip:p - - - name: Switch to the main mirror - shell: msys2 {0} - run: | - echo 'Server = https://repo.msys2.org/mingw/$repo/' > /etc/pacman.d/mirrorlist.mingw - echo 'Server = https://repo.msys2.org/msys/$arch/' > /etc/pacman.d/mirrorlist.msys - pacman-conf.exe - - - name: Update using the main mirror & Check install - run: | - msys2 -c 'pacman --noconfirm -Suuy' - msys2 -c 'pacman --noconfirm -Suu' - msys2 -c 'pacman -Qkq' - - - name: Build Installer - shell: msys2 {0} - run: | - bash make-msys2-installer - - - name: Create 'latest' Variants and Checksums - run: | - mv msys2-${{ matrix.arch_name }}-[0-9]*.exe msys2-${{ matrix.arch_name }}-latest.exe - if ("${{ matrix.arch_name }}" -ne "arm64") { - mv msys2-base-${{ matrix.arch_name }}-[0-9]*.sfx.exe msys2-base-${{ matrix.arch_name }}-latest.sfx.exe - mv msys2-*.tar.xz msys2-base-${{ matrix.arch_name }}-latest.tar.xz - mv msys2-*.tar.zst msys2-base-${{ matrix.arch_name }}-latest.tar.zst - } - mv msys2-*.packages.txt msys2-base-${{ matrix.arch_name }}-latest.packages.txt - sha256sum.exe msys2-* - sha256sum.exe msys2-* > msys2-${{ matrix.arch_name }}-checksums.txt - - - name: Upload Results - uses: actions/upload-artifact@v4 - with: - name: installer-${{ matrix.arch_name }} - path: msys2-* - - test-installer: - name: installer-${{ matrix.image }} - runs-on: windows-${{ matrix.image }} - needs: build-installer - strategy: - fail-fast: false - matrix: - include: - - arch_name: arm64 - image: 11-arm - - arch_name: x86_64 - image: 2022 - - arch_name: x86_64 - image: 2025 - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - persist-credentials: false - - - uses: actions/download-artifact@v4 - with: - name: installer-${{ matrix.arch_name }} - - - name: Install - run: | - ./msys2-${{ matrix.arch_name }}-latest.exe in --confirm-command --accept-messages --root C:/msys2-install-test - - - name: Test without Login Shell - run: | - C:\msys2-install-test\usr\bin\pacman.exe -Syy - C:\msys2-install-test\usr\bin\pacman.exe --noconfirm -S vim - - - name: Test - run: | - C:\msys2-install-test\usr\bin\bash.exe -lc "pacman --version" - C:\msys2-install-test\usr\bin\bash.exe -lc "pacman -Qkv" - C:\msys2-install-test\usr\bin\bash.exe -lc "pacman -Syy" - C:\msys2-install-test\usr\bin\bash.exe -lc "pacman --noconfirm -S git" - - - name: Uninstall - run: | - C:\msys2-install-test\uninstall.exe pr --confirm-command - - test-docker-sfx: - name: docker-sfx-${{ matrix.image }} - runs-on: windows-${{ matrix.image }} - needs: build-installer - strategy: - fail-fast: false - matrix: - image: [2022, 2025] - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - persist-credentials: false - - - uses: actions/download-artifact@v4 - with: - name: installer-x86_64 - - - name: Build image - run: | - docker build -t msys2-base -f ./.ci/Dockerfile.${{ matrix.image }} . - - - name: Test without Login Shell - run: | - docker run msys2-base C:\msys64\usr\bin\pacman.exe -Syy - docker run msys2-base C:\msys64\usr\bin\pacman.exe --noconfirm -S vim - - - name: Test - run: | - docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman --version" - docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -Qkv" - docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -Qkk || true" - docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -Syy" - docker run msys2-base C:\msys64\usr\bin\bash.exe -lc "pacman -S --noconfirm git" - - test-sfx: - name: sfx-${{ matrix.image }} - runs-on: windows-${{ matrix.image }} - needs: build-installer - strategy: - fail-fast: false - matrix: - include: - - arch_name: x86_64 - image: 11-arm - - arch_name: x86_64 - image: 2022 - - arch_name: x86_64 - image: 2025 - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - persist-credentials: false - - - uses: actions/download-artifact@v4 - with: - name: installer-${{ matrix.arch_name }} - - - name: Install - run: | - ./msys2-base-${{ matrix.arch_name }}-latest.sfx.exe -y -oC:/msys2-install-test - - - name: Test without Login Shell - run: | - $env:Path = 'C:\msys2-install-test\msys64\usr\bin;' + $env:Path - C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman-key --init" - C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman-key --populate" - C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman -Syy" - C:\msys2-install-test\msys64\usr\bin\bash.exe -c "pacman --noconfirm -S vim" - - - name: Test - run: | - C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman --version" - C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -Qkv" - C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -Qkk || true" - C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -Syy" - C:\msys2-install-test\msys64\usr\bin\bash.exe -lc "pacman -S --noconfirm git" - - upload-nightly: - permissions: - contents: write - needs: - - zizmor - - test-docker-sfx - - test-installer - - test-sfx - if: github.ref == 'refs/heads/main' - runs-on: ubuntu-latest - steps: - - uses: actions/download-artifact@v4 - with: - name: installer-x86_64 - - - uses: actions/download-artifact@v4 - with: - name: installer-arm64 - - - name: Upload Installers - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh release upload nightly-x86_64 msys2-* --clobber -R ${{ github.repository }} diff --git a/README.md b/README.md index 657fd65..c30e4ab 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,5 @@ # MSYS2 Installer -## Nightly build - -https://github.com/msys2/msys2-installer/releases/tag/nightly-x86_64 - ![screenshot](screenshot.png) ## CLI Usage examples diff --git a/qt-ifw/config/config.xml b/qt-ifw/config/config.xml index 5e1ae27..7c26cae 100644 --- a/qt-ifw/config/config.xml +++ b/qt-ifw/config/config.xml @@ -3,7 +3,7 @@ MSYS2 @VERSION@ MSYS2 - The MSYS2 Developers + Befator Inc. control.js MSYS2 @TargetDir@/ucrt64.exe diff --git a/qt-ifw/packages/com.msys2.root/meta/package.xml b/qt-ifw/packages/com.msys2.root/meta/package.xml index f988a0b..fecc308 100644 --- a/qt-ifw/packages/com.msys2.root/meta/package.xml +++ b/qt-ifw/packages/com.msys2.root/meta/package.xml @@ -1,6 +1,6 @@ - MSYS2 + Befator Inc. MSYS2 Cygwin-derived Posix-like env. for Windows with Arch Linux's Pacman @VERSION@ @DATE@