From 71928f9c3eeaf5ee79ae39653807eae5bfe3ed6a Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Thu, 27 Jun 2024 21:58:39 -0500 Subject: [PATCH 1/5] Bump go to 1.22.4 --- .tool-versions | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index f526442..df4d136 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.22.0 +golang 1.22.4 diff --git a/go.sum b/go.sum index 949aa33..f4c4d8f 100644 --- a/go.sum +++ b/go.sum @@ -20,6 +20,7 @@ golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From ee1f9ee60c95321656f6cc0ba21935a56af5ed6c Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Tue, 2 Jul 2024 23:11:39 -0500 Subject: [PATCH 2/5] Rename vendor to tests fine. go, you win. --- .gitmodules | 4 ++-- Makefile | 18 +++++++++--------- {vendor => tests}/gameboy-doctor | 0 {vendor => tests}/gb-test-roms | 0 4 files changed, 11 insertions(+), 11 deletions(-) rename {vendor => tests}/gameboy-doctor (100%) rename {vendor => tests}/gb-test-roms (100%) diff --git a/.gitmodules b/.gitmodules index b8545e0..92087ea 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "vendor/gameboy-doctor"] - path = vendor/gameboy-doctor + path = tests/gameboy-doctor url = git@github.com:robert/gameboy-doctor.git [submodule "vendor/gb-test-roms"] - path = vendor/gb-test-roms + path = tests/gb-test-roms url = git@github.com:retrio/gb-test-roms.git diff --git a/Makefile b/Makefile index 78a3a63..8a8e7a7 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ help: .PHONY: tidy tidy: - go fmt -mod=mod ./... + go fmt ./... go mod tidy -v .PHONY: build @@ -29,18 +29,18 @@ clean: .PHONY: run run: - $(GO) run -mod=mod . + $(GO) run . .PHONY: test test: - $(GO) test -mod=mod -v ./... + $(GO) test -v ./... .PHONY: bin/gogo-gb # This does exist, but we're not tracking its dependencies. Go is bin/gogo-gb: - $(GO) build -mod=mod -o bin/gogo-gb . + $(GO) build -o bin/gogo-gb . .PHONY: cpu_instrs -cpu_instrs: bin/gogo-gb vendor/gameboy-doctor/gameboy-doctor vendor/gb-test-roms/cpu_instrs/individual/*.gb +cpu_instrs: bin/gogo-gb tests/gameboy-doctor/gameboy-doctor tests/gb-test-roms/cpu_instrs/individual/*.gb # These are broken upstream: # 02-interrupts.gb @CPU_TESTS=( \ @@ -59,18 +59,18 @@ cpu_instrs: bin/gogo-gb vendor/gameboy-doctor/gameboy-doctor vendor/gb-test-roms test_name=$${file%*.gb}; \ test_num=$$((10#$${test_name%-*})); \ echo "=== Starting cpu_instrs test $$file ==="; \ - bin/gogo-gb --cart "vendor/gb-test-roms/cpu_instrs/individual/$$file" \ + bin/gogo-gb --cart "tests/gb-test-roms/cpu_instrs/individual/$$file" \ --debugger=gameboy-doctor \ --log=stderr | \ - ./vendor/gameboy-doctor/gameboy-doctor - cpu_instrs "$$test_num" || \ + ./tests/gameboy-doctor/gameboy-doctor - cpu_instrs "$$test_num" || \ { ec=$$?; [ $$ec -eq 141 ] && true || (exit $$ec); }; \ echo "=== Finished cpu_instrs test $$file ===" ; \ done -vendor/gameboy-doctor/gameboy-doctor: +tests/gameboy-doctor/gameboy-doctor: git submodule init git submodule update -vendor/gb-test-roms/cpu_instrs/individual/*.gb: +tests/gb-test-roms/cpu_instrs/individual/*.gb: git submodule init git submodule update diff --git a/vendor/gameboy-doctor b/tests/gameboy-doctor similarity index 100% rename from vendor/gameboy-doctor rename to tests/gameboy-doctor diff --git a/vendor/gb-test-roms b/tests/gb-test-roms similarity index 100% rename from vendor/gb-test-roms rename to tests/gb-test-roms From 98820d58fe0c2eb043a2b0e62b324df5680464d3 Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Tue, 3 Sep 2024 21:14:54 -0500 Subject: [PATCH 3/5] Bump go version requirement to 1.23 --- .tool-versions | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.tool-versions b/.tool-versions index df4d136..1a59aeb 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.22.4 +golang 1.23.0 diff --git a/go.mod b/go.mod index 728c330..4f4e36b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/maxfierke/gogo-gb -go 1.22.0 +go 1.23.0 require ( github.com/hajimehoshi/ebiten/v2 v2.7.3 From 81b354701942cb92a649543f8fc5d1fa42c7db83 Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Sat, 7 Sep 2024 12:06:14 -0500 Subject: [PATCH 4/5] Use go 1.23.1 in development --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 1a59aeb..c9953ae 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -golang 1.23.0 +golang 1.23.1 From 2987ee89bea15a9e4ac57efc1d2ec6b9f32fc5dd Mon Sep 17 00:00:00 2001 From: Max Fierke Date: Sat, 7 Sep 2024 12:09:15 -0500 Subject: [PATCH 5/5] Bump go versions in actions --- .github/workflows/ci.yml | 2 +- .github/workflows/golangci-lint.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1f7e517..1acfe82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.22' + go-version: '1.23' - name: Build run: make build diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index c1bdbfc..d958a81 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -22,9 +22,9 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: '1.22' + go-version: '1.23' cache: false - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.55.2 + version: v1.60.3