From 651494a88180f3daad6fcf76e83922eaf80877c2 Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Tue, 14 Jan 2025 17:08:15 -0800 Subject: [PATCH 1/2] Update Go version to 1.23 On branch feature/update-go-version Changes to be committed: modified: .github/workflows/deploy.yml modified: .github/workflows/release.yml modified: .github/workflows/run_tests.yml modified: .github/workflows/update_items.yml modified: Dockerfile modified: README.md modified: go.mod --- .github/workflows/deploy.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/run_tests.yml | 2 +- .github/workflows/update_items.yml | 2 +- Dockerfile | 2 +- README.md | 6 +++--- go.mod | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4f73a2d6d0..69f1992486 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.21.x + go-version: 1.23.x - name: Install Protoc uses: arduino/setup-protoc@v1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d724a2bdb..968c03d8ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.21.x + go-version: 1.23.x - name: Install Protoc uses: arduino/setup-protoc@v1 diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 69aa74c8cf..7bc6c2e597 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -10,7 +10,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.21.x + go-version: 1.23.x - name: Install Protoc uses: arduino/setup-protoc@v1 diff --git a/.github/workflows/update_items.yml b/.github/workflows/update_items.yml index a1d82764bb..fa25df14c2 100644 --- a/.github/workflows/update_items.yml +++ b/.github/workflows/update_items.yml @@ -12,7 +12,7 @@ jobs: - name: Install Go uses: actions/setup-go@v2 with: - go-version: 1.21.x + go-version: 1.23.x - name: Install Protoc uses: arduino/setup-protoc@v1 diff --git a/Dockerfile b/Dockerfile index 804b8f3464..fa3af54d9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM golang:1.21 +FROM golang:1.23 WORKDIR /cata diff --git a/README.md b/README.md index 6783dccc31..ecfd21a071 100644 --- a/README.md +++ b/README.md @@ -20,16 +20,16 @@ Then unzip the downloaded file, then open the unzipped file to open the sim in y Alternatively, you can choose from a specific relase on the [Releases](https://github.com/wowsims/cata/releases) page and click the suitable link under "Assets" # Local Dev Installation -This project has dependencies on Go >=1.21, protobuf-compiler and the corresponding Go plugins, and node >= 20. +This project has dependencies on Go >=1.23, protobuf-compiler and the corresponding Go plugins, and node >= 20. ## Ubuntu Do not use apt to install any dependencies, the versions they install are all too old. Script below will curl latest versions and install them. ```sh # Standard Go installation script -curl -O https://dl.google.com/go/go1.21.1.linux-amd64.tar.gz +curl -O https://dl.google.com/go/go1.23.4.linux-amd64.tar.gz sudo rm -rf /usr/local/go -sudo tar -C /usr/local -xzf go1.21.1.linux-amd64.tar.gz +sudo tar -C /usr/local -xzf go1.23.4.linux-amd64.tar.gz echo 'export PATH=$PATH:/usr/local/go/bin' >> $HOME/.bashrc echo 'export GOPATH=$HOME/go' >> $HOME/.bashrc echo 'export PATH=$PATH:$GOPATH/bin' >> $HOME/.bashrc diff --git a/go.mod b/go.mod index c101a4d84b..54d7d8774d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/wowsims/cata -go 1.21 +go 1.23 require ( github.com/golang/protobuf v1.5.4 From 4149f5bcce91cf19cd894b6816e6a74e253618fb Mon Sep 17 00:00:00 2001 From: NerdEgghead Date: Tue, 14 Jan 2025 17:08:58 -0800 Subject: [PATCH 2/2] Fix bug in Combat Rogue Bandit's Guile implementation On branch feature/update-go-version Changes to be committed: modified: sim/rogue/combat/bandits_guile.go --- sim/rogue/combat/bandits_guile.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/sim/rogue/combat/bandits_guile.go b/sim/rogue/combat/bandits_guile.go index e20b312135..f11654f6f8 100644 --- a/sim/rogue/combat/bandits_guile.go +++ b/sim/rogue/combat/bandits_guile.go @@ -43,9 +43,6 @@ func (comRogue *CombatRogue) registerBanditsGuile() { if currentInsightIndex == 2 { currentInsightIndex = -1 attackCounter = 0 - } else if currentInsightIndex == index { - // This Insight faded without advancing, reset to no Insight - currentInsightIndex = -1 } }, })