From 73e9461418259a05e3c15ae08e0350389f91def9 Mon Sep 17 00:00:00 2001 From: keegan Date: Wed, 29 Apr 2026 10:16:29 +0000 Subject: [PATCH 1/4] ci: modernize scip-go workflow to use scip-go-action@v2 --- .github/workflows/scip-go.yml | 49 +++++++++++++++-------------------- 1 file changed, 21 insertions(+), 28 deletions(-) mode change 100644 => 100755 .github/workflows/scip-go.yml diff --git a/.github/workflows/scip-go.yml b/.github/workflows/scip-go.yml old mode 100644 new mode 100755 index 7b664f8..62818c3 --- a/.github/workflows/scip-go.yml +++ b/.github/workflows/scip-go.yml @@ -1,40 +1,33 @@ name: scip-go -'on': +"on": push: paths: - '**.go' - - '.github/workflows/scip-go.yml' + - '**/scip-go.yml' + +concurrency: + group: ${{ github.workflow }} + +permissions: + contents: read + jobs: scip-go: if: github.repository == 'sourcegraph/log' runs-on: ubuntu-latest - container: sourcegraph/scip-go steps: - name: Checkout - uses: actions/checkout@v2 - - name: Get src-cli - run: curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o /usr/local/bin/src; - chmod +x /usr/local/bin/src - - name: Set directory to safe for git - run: git config --global --add safe.directory $GITHUB_WORKSPACE - - name: Run scip-go - working-directory: '' - run: scip-go --no-animation + uses: actions/checkout@v3 - - name: Upload SCIP to Cloud - run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress - env: - SRC_ENDPOINT: https://sourcegraph.com/ - SRC_ACCESS_TOKEN: ${{ secrets.SRC_ACCESS_TOKEN_DOTCOM }} + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version-file: go.mod - - name: Upload SCIP to S2 - run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress - env: - SRC_ENDPOINT: https://sourcegraph.sourcegraph.com/ - SRC_ACCESS_TOKEN: ${{ secrets.SRC_ACCESS_TOKEN_S2 }} - - - name: Upload SCIP to Demo - run: src code-intel upload -github-token='${{ secrets.GITHUB_TOKEN }}' -no-progress || true - env: - SRC_ENDPOINT: https://demo.sourcegraph.com/ - SRC_ACCESS_TOKEN: ${{ secrets.SRC_ACCESS_TOKEN_DEMO }} + - name: Run scip-go and upload + uses: sourcegraph/scip-go-action@v2 + with: + sourcegraph-url: https://sourcegraph.sourcegraph.com/ + sourcegraph-token: ${{ secrets.SRC_ACCESS_TOKEN_S2 }} + scip-go-version: v0.2.2 + upload: true From af2db1ee38374a73214be745284f02729d6e05da Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Wed, 29 Apr 2026 16:35:25 +0200 Subject: [PATCH 2/4] do not specify scip-go-version --- .github/workflows/scip-go.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/scip-go.yml b/.github/workflows/scip-go.yml index 62818c3..2f6fcbb 100755 --- a/.github/workflows/scip-go.yml +++ b/.github/workflows/scip-go.yml @@ -29,5 +29,4 @@ jobs: with: sourcegraph-url: https://sourcegraph.sourcegraph.com/ sourcegraph-token: ${{ secrets.SRC_ACCESS_TOKEN_S2 }} - scip-go-version: v0.2.2 upload: true From 5a1767761fc78d1299fdcc0e4d1fede93c9f43e6 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Wed, 29 Apr 2026 16:37:00 +0200 Subject: [PATCH 3/4] bump go version in go.mod --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1b0113b..bfb584b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/sourcegraph/log -go 1.19 +go 1.25.9 require ( github.com/cockroachdb/errors v1.9.1 diff --git a/go.sum b/go.sum index 10b46bf..0bcce0f 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,7 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -61,6 +62,7 @@ github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/ github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= +github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= @@ -254,6 +256,7 @@ go.bobheadxi.dev/streamline v1.2.2/go.mod h1:KmvTJfIYW7/8h9X3H/d/L86QYH7d0FHPjjO go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= From 5c25a214540941f6791da2a0db12ee42bb5499b0 Mon Sep 17 00:00:00 2001 From: Keegan Carruthers-Smith Date: Wed, 29 Apr 2026 16:41:29 +0200 Subject: [PATCH 4/4] update pipeline.yaml --- .github/workflows/pipeline.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 5441817..4beef09 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -10,15 +10,12 @@ jobs: - uses: actions/checkout@v3 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v5 with: - go-version: 1.19 + go-version-file: go.mod - name: Build run: go build -v ./... - name: Test - run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./... - - - name: Codecov - uses: codecov/codecov-action@v2 + run: go test -v -race -covermode=atomic ./...