diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9fa402a..75a0ff6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,10 +9,10 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Test run: go test ./... diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e6ea0d4..ccc4387 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -5,7 +5,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v5 with: go-version: 1.18.x - name: Checkout code @@ -20,11 +20,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: golangci-lint - uses: golangci/golangci-lint-action@v2 - with: - version: v1.59.1 + uses: golangci/golangci-lint-action@v6 test: strategy: diff --git a/version.go b/version.go index b06ffdc..4ca416b 100644 --- a/version.go +++ b/version.go @@ -146,7 +146,10 @@ func (v *Version) Compare(other *Version) int { return -1 } - return comparePrereleases(preSelf, preOther) + if comp := comparePrereleases(preSelf, preOther); comp != 0 { + return comp + } + return strings.Compare(v.metadata, other.metadata) } // Get the highest specificity (hS), or if they're equal, just use segmentSelf length