From aca081e6af2c5fe49882c7ccbcf2d5adfba3356f Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Tue, 2 Apr 2024 17:59:36 +0800 Subject: [PATCH] Release version built with Go 1.22.x (#2517) * Use latest LTS dependency versions for build pieces Signed-off-by: Chad Wilson * Fix CodeQL warning Apparently no longer need to do this HEAD^2 stuff according to warning on the actions. "1 issue was detected with this workflow: git checkout HEAD^2 is no longer necessary. Please remove this step as Code Scanning recommends analyzing the merge commit for best results." Signed-off-by: Chad Wilson * Bump version for release Signed-off-by: Chad Wilson --------- Signed-off-by: Chad Wilson --- .github/workflows/codeql-analysis.yml | 12 +----------- .github/workflows/release.yml | 8 ++++---- .github/workflows/tests.yml | 2 +- go.mod | 6 +++--- go.sum | 12 ++++++------ version/version.go | 2 +- 6 files changed, 16 insertions(+), 26 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index c43b16c56..376cdd127 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -22,17 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - # We must fetch at least the immediate parents so that if this is - # a pull request then we can checkout the head. - fetch-depth: 2 - - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} + - uses: actions/checkout@v4 - name: Set up Go uses: actions/setup-go@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d401f6757..66cb0dd9d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -147,7 +147,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' # caching pip dependencies - name: Fetch gauge version @@ -179,7 +179,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'npm' cache-dependency-path: 'build/npm/package-lock.json' registry-url: 'https://registry.npmjs.org' @@ -250,10 +250,10 @@ jobs: - uses: actions/checkout@v4 - run: git fetch --prune --unshallow - - name: Set up Ruby 3.1.4 + - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1.4 + ruby-version: 3.3 - name: Fetch gauge version uses: actions/download-artifact@v4 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a69ebc2f7..922770219 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -46,7 +46,7 @@ jobs: - name: Set up Nodejs uses: actions/setup-node@v4 with: - node-version: 18 + node-version: 20 cache: 'npm' cache-dependency-path: 'build/npm/package-lock.json' diff --git a/go.mod b/go.mod index 5964fc2f7..42ca9b0ba 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/apoorvam/goterminal v0.0.0-20180523175556-614d345c47e5 github.com/daviddengcn/go-colortext v1.0.0 github.com/fsnotify/fsnotify v1.7.0 - github.com/getgauge/common v0.0.0-20240214053023-28ee5a460a1a - github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240305092417-e4088981ee73 + github.com/getgauge/common v0.0.0-20240331100109-225c78ec8f30 + github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240331094732-ac276d4db3b9 github.com/golang/protobuf v1.5.4 github.com/magiconair/properties v1.8.7 github.com/natefinch/lumberjack v2.0.0+incompatible @@ -18,7 +18,7 @@ require ( github.com/sourcegraph/jsonrpc2 v0.2.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 - google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa + google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda google.golang.org/grpc v1.62.1 google.golang.org/protobuf v1.33.0 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c diff --git a/go.sum b/go.sum index a4c59f6e0..a2e57bd91 100644 --- a/go.sum +++ b/go.sum @@ -12,10 +12,10 @@ github.com/dmotylev/goproperties v0.0.0-20140630191356-7cbffbaada47 h1:sP2APvSdZ github.com/dmotylev/goproperties v0.0.0-20140630191356-7cbffbaada47/go.mod h1:f2V6964+f0p8Asqy8mIK5cKyyVc6MP9PFzGVNRcnYJQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/getgauge/common v0.0.0-20240214053023-28ee5a460a1a h1:dsWj79luVu7Z3E7wMxuhML5bEPmzRTgeqJpFI9tOIaM= -github.com/getgauge/common v0.0.0-20240214053023-28ee5a460a1a/go.mod h1:Vu5kOgjEwk6b42YuyV/vBVLZs5WRpaISErERl+az4pg= -github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240305092417-e4088981ee73 h1:WkPxV7TpYcqzSWHMSEnDAKJFLWugp/rWtvHVJz+0h0E= -github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240305092417-e4088981ee73/go.mod h1:TXmEkop8jQOf4Q84sCcbJE1kVvb3rcZLkMHL6WbCbcQ= +github.com/getgauge/common v0.0.0-20240331100109-225c78ec8f30 h1:pGrxY3IZb/1wwlSUSKYplmQ9kEh4rRpcAvQYI2WcxX0= +github.com/getgauge/common v0.0.0-20240331100109-225c78ec8f30/go.mod h1:q7UW1tDojJwCQPUHaE1ny71IZIDuKlsgh3Tyr5wAZDk= +github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240331094732-ac276d4db3b9 h1:g3Qhoj4ho3txgMcOJ3ivvEhfahaR6t8XTkf5K5M1VSA= +github.com/getgauge/gauge-proto/go/gauge_messages v0.0.0-20240331094732-ac276d4db3b9/go.mod h1:ZOT57PjvIqY31eGcwhj/LSi/K6ULBE1AhFcIMzWkmPg= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450/go.mod h1:Bk6SMAONeMXrxql8uvOKuAZSu8aM5RUGv+1C6IJaEho= @@ -67,8 +67,8 @@ golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= diff --git a/version/version.go b/version/version.go index 87e212ccf..4aa25933e 100644 --- a/version/version.go +++ b/version/version.go @@ -14,7 +14,7 @@ import ( ) // CurrentGaugeVersion represents the current version of Gauge -var CurrentGaugeVersion = &Version{1, 6, 4} +var CurrentGaugeVersion = &Version{1, 6, 5} // BuildMetadata represents build information of current release (e.g, nightly build information) var BuildMetadata = ""