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.

Sign up for GitHub

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

114 fix workflows #116

Merged
merged 7 commits into from
Nov 8, 2022
Merged

114 fix workflows #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7b68102
Take 2
vintagepc Nov 6, 2022
1fc2742
Fix packing directives, bulid with ninja
vintagepc Nov 6, 2022
953cdf1
Update build.yml
vintagepc Nov 8, 2022
5d54280
Update build.yml
vintagepc Nov 8, 2022
7b7aff0
Update build.yml
vintagepc Nov 8, 2022
5d7f59e
Update build.yml
vintagepc Nov 8, 2022
52a4d88
Update build.yml
vintagepc Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ 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 }}
ref: ${{ github.event.pull_request.head.sha }}
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 }}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -105,15 +105,15 @@ 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 }}
ref: ${{ github.event.pull_request.head.sha }}
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 }}
Expand Down Expand Up @@ -147,28 +147,34 @@ 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 }}
ref: ${{ github.event.pull_request.head.sha }}
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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ 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
ref: ${{ github.event.pull_request.head.sha }}
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
Expand Down
4 changes: 2 additions & 2 deletions hw/arm/prusa/stm32f407/stm32f4xx_usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down