diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 85416a0494..96fce71d4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout ${{ github.event.pull_request.head.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ github.event.pull_request }} with: repository: ${{ github.repository }} @@ -31,7 +31,7 @@ jobs: submodules: false - name: Checkout ${{ github.event.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ !github.event.pull_request }} with: repository: ${{ github.repository }} @@ -62,10 +62,10 @@ jobs: run: cd ${{ runner.workspace }}/MINI404 && ./configure --target-list="buddy-softmmu" --enable-libusb --enable-gtk - name: Build qemu-system-buddy - run: cd ${{ runner.workspace }}/MINI404 && make -j3 + run: cd ${{ runner.workspace }}/MINI404/build && ninja - name: Checkout Wiki - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ !github.event.pull_request }} with: repository: vintagepc/MINI404.wiki.git @@ -105,7 +105,7 @@ jobs: steps: # # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout ${{ github.event.pull_request.head.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ github.event.pull_request }} with: repository: ${{ github.repository }} @@ -113,7 +113,7 @@ jobs: submodules: true - name: Checkout ${{ github.event.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ !github.event.pull_request }} with: repository: ${{ github.repository }} @@ -147,20 +147,26 @@ jobs: build_msys: # The type of runner that the job will run on - runs-on: windows-2019 - if: "!contains(github.event.head_commit.message, 'NO_BUILD')" + runs-on: windows-latest steps: - name: Install MSYS2 uses: msys2/setup-msys2@v2 with: msystem: MINGW64 - install: make git zip mingw-w64-x86_64-diffutils diffutils python mingw-w64-x86_64-ninja mingw-w64-x86_64-toolchain mingw-w64-x86_64-gtk3 mingw-w64-x86_64-freeglut mingw-w64-x86_64-glew mingw-w64-x86_64-libusb mingw-w64-x86_64-SDL2 mingw-w64-x86_64-pixman mingw-w64-x86_64-glib2 python-setuptools mingw-w64-x86_64-make mingw-w64-x86_64-curl mingw-w64-x86_64-libjxl mingw-w64-x86_64-SDL2_image - + install: make git zip wget mingw-w64-x86_64-diffutils diffutils mingw-w64-x86_64-ninja mingw-w64-x86_64-toolchain mingw-w64-x86_64-gtk3 mingw-w64-x86_64-freeglut mingw-w64-x86_64-glew mingw-w64-x86_64-libusb mingw-w64-x86_64-SDL2 mingw-w64-x86_64-pixman mingw-w64-x86_64-glib2 python-setuptools mingw-w64-x86_64-make mingw-w64-x86_64-curl mingw-w64-x86_64-libjxl mingw-w64-x86_64-SDL2_image + + - name: Install old Python + run: | + wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.9.13-1-any.pkg.tar.zst + wget https://repo.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-3.9.13-1-any.pkg.tar.zst.sig + pacman --noconfirm -U mingw-w64-x86_64-python-3.9.13-1-any.pkg.tar.zst + shell: msys2 {0} + - name: Fix CRLF Checkout run: git config --global core.autocrlf false - name: Checkout ${{ github.event.pull_request.head.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ github.event.pull_request }} with: repository: ${{ github.repository }} @@ -168,7 +174,7 @@ jobs: submodules: false - name: Checkout ${{ github.event.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ !github.event.pull_request }} with: repository: ${{ github.repository }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 450872875c..6e40624f66 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -21,7 +21,7 @@ jobs: steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - name: Checkout ${{ github.event.pull_request.head.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ github.event.pull_request }} with: repository: vintagepc/MINI404.git @@ -29,7 +29,7 @@ jobs: submodules: false - name: Checkout ${{ github.event.ref }} - uses: actions/checkout@v2.5.0 + uses: actions/checkout@v3 if: ${{ !github.event.pull_request }} with: repository: vintagepc/MINI404.git diff --git a/hw/arm/prusa/stm32f407/stm32f4xx_usb.c b/hw/arm/prusa/stm32f407/stm32f4xx_usb.c index ae7d288011..f96a5c2819 100644 --- a/hw/arm/prusa/stm32f407/stm32f4xx_usb.c +++ b/hw/arm/prusa/stm32f407/stm32f4xx_usb.c @@ -714,7 +714,7 @@ typedef union { uint32_t DPID :2; uint32_t PKTSTS :4; uint32_t :11; - } HOST QEMU_PACKED; + } QEMU_PACKED HOST; struct { uint32_t EPNUM :4; uint32_t BCNT :11; @@ -723,7 +723,7 @@ typedef union { uint32_t FRMNUM :4; uint32_t :6; REG_B32(INCOMPLETE); // NB- this isn't used by the device, rather by us to handle multi-packet IN transfers. - } DEV QEMU_PACKED; + } QEMU_PACKED DEV; } buffer_header_t; enum {