Skip to content

Upgrade CI to use windows-2022. #119

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

Merged
merged 1 commit into from
Sep 11, 2025
Merged

Upgrade CI to use windows-2022. #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/c-cpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:

build-windows:
name: Build and run tests on Windows
runs-on: windows-2019
runs-on: windows-2022
permissions:
contents: read
pull-requests: read
Expand All @@ -74,10 +74,10 @@ jobs:
echo "C:\msys64\usr\bin" >> $GITHUB_PATH
echo "CC=i686-w64-mingw32-gcc" >> "$GITHUB_ENV"
shell: bash
- name: Install ZIP
- name: Install packages
run: |
export
pacman -Sy --noconfirm --noprogressbar --needed zip
pacman -Sy --noconfirm --noprogressbar --needed zip mingw-w64-i686-gcc mingw-w64-x86_64-gcc
shell: bash
- name: make
run: |
Expand Down
24 changes: 18 additions & 6 deletions rules.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,24 @@ dist: $(ATR) $(ZIPFILE)

.PHONY: clean
clean:
$(Q)rm -f $(OBJS) $(LSTS) $(FILES) $(ATR) $(ZIPFILE) $(XEXS) $(MAPS) \
$(LBLS) $(SYNTP) $(COMPILER_HOST) $(FASTBASIC_TARGET_OBJ) \
$(FASTBASIC_HOST_DEPS) $(FASTBASIC_TARGET_DEPS) $(SYNTAX_PARSER_DEPS)\
$(SAMPLE_BAS:%.bas=build/gen/%.asm) \
$(FASTBASIC_HOST_OBJ) $(SYNTAX_PARSER_OBJ)
$(Q)rm -f $(TESTS_XEX) $(TESTS_ROM) $(TESTS_ASM) $(TESTS_OBJ) $(TESTS_ATB) $(TESTS_LBL) $(RUNTEST_OBJS) $(RUNTEST) $(TESTS_STAMP) $(RUNTEST_OBJS:.o=.d)
$(Q)rm -f $(OBJS)
$(Q)rm -f $(LSTS)
$(Q)rm -f $(FILES)
$(Q)rm -f $(ATR) $(ZIPFILE)
$(Q)rm -f $(XEXS) $(MAPS) $(LBLS)
$(Q)rm -f $(SYNTP) $(COMPILER_HOST)
$(Q)rm -f $(FASTBASIC_TARGET_OBJ) $(FASTBASIC_HOST_OBJ)
$(Q)rm -f $(SYNTAX_PARSER_OBJ) $(SYNTAX_PARSER_DEPS)
$(Q)rm -f $(FASTBASIC_HOST_DEPS) $(FASTBASIC_TARGET_DEPS)
$(Q)rm -f $(SAMPLE_BAS:%.bas=build/gen/%.asm)
$(Q)rm -f $(TESTS_XEX)
$(Q)rm -f $(TESTS_ROM)
$(Q)rm -f $(TESTS_ASM)
$(Q)rm -f $(TESTS_OBJ)
$(Q)rm -f $(TESTS_ATB)
$(Q)rm -f $(TESTS_LBL)
$(Q)rm -f $(TESTS_STAMP)
$(Q)rm -f $(RUNTEST_OBJS) $(RUNTEST) $(RUNTEST_OBJS:.o=.d)

.PHONY: distclean
distclean: clean
Expand Down
Loading