diff --git a/.github/workflows/experiments.yml b/.github/workflows/experiments.yml index d22e64c..a62d04e 100644 --- a/.github/workflows/experiments.yml +++ b/.github/workflows/experiments.yml @@ -36,26 +36,38 @@ jobs: py -3 -V py -3 -m pip list - - name: Upgrade msys2/mingw32 - id: upgrade-mingw32 - uses: msys2/setup-msys2@v2 - with: - msystem: mingw32 - release: false - update: true - cache: true - install: mingw-w64-i686-toolchain + # - name: Upgrade msys2/mingw32 + # id: upgrade-mingw32 + # uses: msys2/setup-msys2@v2 + # with: + # msystem: mingw32 + # release: false + # update: true + # cache: true + # install: mingw-w64-i686-toolchain - - name: Upgrade msys2/mingw64 - id: upgrade-mingw64 - uses: msys2/setup-msys2@v2 - with: - msystem: mingw64 - release: false - update: true - cache: true - install: mingw-w64-x86_64-toolchain + # - name: Upgrade msys2/mingw64 + # id: upgrade-mingw64 + # uses: msys2/setup-msys2@v2 + # with: + # msystem: mingw64 + # release: false + # update: true + # cache: true + # install: mingw-w64-x86_64-toolchain + - name: Setup mingw32 + id: setup-mingw32 + uses: egor-tensin/setup-mingw@v2 + with: + platform: x86 + + - name: Setup mingw64 + id: setup-mingw64 + uses: egor-tensin/setup-mingw@v2 + with: + platform: x64 + - name: Print environment shell: cmd run: | @@ -71,8 +83,16 @@ jobs: where gcc.exe gcc.exe -v echo ---------------------------------------------------- - echo mingw32 location: ${{steps.upgrade-mingw32.outputs.msys2-location}} - echo mingw64 location: ${{steps.upgrade-mingw64.outputs.msys2-location}} + echo msys2/mingw32 location: ${{steps.upgrade-mingw32.outputs.msys2-location}} + echo msys2/mingw64 location: ${{steps.upgrade-mingw64.outputs.msys2-location}} + echo mingw32.prefix: ${{steps.setup-mingw32.outputs.prefix}} + echo mingw32.gcc: ${{steps.setup-mingw32.outputs.gcc}} + echo mingw32.gxx: ${{steps.setup-mingw32.outputs.gxx}} + echo mingw32.windres: ${{steps.setup-mingw32.outputs.windres}} + echo mingw64.prefix: ${{steps.setup-mingw64.outputs.prefix}} + echo mingw64.gcc: ${{steps.setup-mingw64.outputs.gcc}} + echo mingw64.gxx: ${{steps.setup-mingw64.outputs.gxx}} + echo mingw64.windres: ${{steps.setup-mingw64.outputs.windres}} echo ==================================================== py -0p echo ----------------------------------------------------