🐛 Update deps (#196)

* 🐛 Update deps Signed-off-by: Pranav Gaikwad <[email protected]> * 👻 use correct branch in workflow Signed-off-by: Pranav Gaikwad <[email protected]> * Fix dependency test: update deps-output.yaml test output file. (#191) Signed-off-by: Keerthi Thatipally <[email protected]> --------- Signed-off-by: Pranav Gaikwad <[email protected]> Signed-off-by: Keerthi Thatipally <[email protected]> Co-authored-by: Keerthi Thatipally <[email protected]>
konveyor · Apr 16, 2024 · 559df66 · 559df66
1 parent ef31e59
commit 559df66
Show file tree

Hide file tree

Showing 4 changed files with 377 additions and 7 deletions.
diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml
@@ -6,6 +6,33 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Extract pull request number from inputs or PR description
+        run: |
+          PULL_REQUEST_NUMBER=$(echo "${{ github.event.pull_request.body }}" | grep -oP 'Analyzer PR: \K\d+' || true)
+          echo "ANALYZER_REF=${CURRENT_BRANCH#refs/heads/}" >>$GITHUB_ENV
+          if [ ! -z "${BASE_BRANCH}" ]; then
+            echo "ANALYZER_REF=${BASE_BRANCH}" >>$GITHUB_ENV
+          fi            
+          if [ ! -z "$PULL_REQUEST_NUMBER" ]; then
+            echo "ANALYZER_REF=refs/pull/$PULL_REQUEST_NUMBER/merge" >>$GITHUB_ENV
+          fi
+          echo "Using analyzer branch ${{ env.ANALYZER_REF }}"
+        env:
+          CURRENT_BRANCH: ${{ github.ref }}
+          BASE_BRANCH: ${{ github.event.pull_request.base.ref }}
+
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          repository: konveyor/analyzer-lsp
+          ref: "${{ env.ANALYZER_REF}}"
+          path: analyzer-lsp
+
+      - name: Build anaylzer and save image
+        working-directory: analyzer-lsp
+        run: |
+          podman build -t quay.io/konveyor/analyzer-lsp:latest .
+      
       - uses: actions/checkout@v3
 
       - name: Build image and binary

diff --git a/go.mod b/go.mod
@@ -30,7 +30,7 @@ require (
 	golang.org/x/text v0.13.0 // indirect
 	google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
 	google.golang.org/grpc v1.54.0 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
@@ -40,7 +40,7 @@ require (
 	github.com/bombsimon/logrusr/v3 v3.1.0
 	github.com/codingconcepts/env v0.0.0-20200821220118-a8fbf8d84482
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/konveyor/analyzer-lsp v0.3.0-beta.1.2
+	github.com/konveyor/analyzer-lsp v0.3.2-0.20240415173629-3e35a115ccf7
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/pflag v1.0.5 // indirect

diff --git a/go.sum b/go.sum
@@ -36,8 +36,8 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/invopop/yaml v0.1.0 h1:YW3WGUoJEXYfzWBjn00zIlrw7brGVD0fUKRYDPAPhrc=
 github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
-github.com/konveyor/analyzer-lsp v0.3.0-beta.1.2 h1:yZh5rTZYq1XYzDei3/zwZOqE8XktftaETNycV3Q7ACE=
-github.com/konveyor/analyzer-lsp v0.3.0-beta.1.2/go.mod h1:zJCmIq08X0kPvtU8ZSmz+mZmQfBt4hdy9enoEy1AQw4=
+github.com/konveyor/analyzer-lsp v0.3.2-0.20240415173629-3e35a115ccf7 h1:o8XqzJM9S+/TeH0A0mb53xZwBmpAxKVnXdnr9JDzGm0=
+github.com/konveyor/analyzer-lsp v0.3.2-0.20240415173629-3e35a115ccf7/go.mod h1:p2KiLHAektd5JAxYFOKFBagln+O8uqpkLW8knf/xIyQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
@@ -96,8 +96,8 @@ google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag=
 google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=