fix(v2): replace leftovers of v1.2 to v2 /2

Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
werf · Apr 25, 2024 · d6cacfb · d6cacfb
1 parent a8b677c
commit d6cacfb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/_coverage_report.yml b/.github/workflows/_coverage_report.yml
@@ -53,7 +53,7 @@ jobs:
             sed -i -e "s|/Users/runner/runners/[0-9.]*/work/werf/werf|github.com/werf/werf|g" {} +
 
           find coverage -type f -exec \
-            sed -i -e 's|D:\\a\\werf\\werf\\cmd\\werf\\main.go|github.com/werf/werf/cmd/werf/main.go|g' {} +
+            sed -i -e 's|D:\\a\\werf\\werf\\cmd\\werf\\main.go|github.com/werf/werf/v2/cmd/werf/main.go|g' {} +
 
           coverage_files=$(find coverage -name '*.out')
           gocovmerge ${coverage_files[@]} > coverage.out
@@ -63,7 +63,7 @@ jobs:
           export GIT_BRANCH="${GITHUB_REF:11}"
           export GIT_COMMIT_SHA="$GITHUB_SHA"
 
-          ./reporter format-coverage -t=gocov -p=github.com/werf/werf/ coverage.out
+          ./reporter format-coverage -t=gocov -p=github.com/werf/werf/v2/ coverage.out
           ./reporter upload-coverage
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
diff --git a/integration/README.md b/integration/README.md
@@ -180,7 +180,7 @@ var _ = Describe("COMPONENT", func() {
 
 ### Catch and test werf output in realtime
 
-`github.com/werf/werf/test/pkg/utils/liveexec` package provides execution of external commands with realtime output handling and ability to fail fast when expectation of output was not met. Example of liveexec usage:
+`github.com/werf/werf/v2/test/pkg/utils/liveexec` package provides execution of external commands with realtime output handling and ability to fail fast when expectation of output was not met. Example of liveexec usage:
 
 ```
 func werfDeploy(dir string, opts liveexec.ExecCommandOptions, extraArgs ...string) error {

diff --git a/pkg/buildah/thirdparty/builderinfo_others.go b/pkg/buildah/thirdparty/builderinfo_others.go
@@ -9,7 +9,7 @@ import (
 
 //
 // BuilderInfo is copied from github.com/containers/buildah
-// to provide crossplatform types definitions in the github.com/werf/werf/pkg/buildah package.
+// to provide crossplatform types definitions in the github.com/werf/werf/v2/pkg/buildah package.
 //
 
 // BuilderInfo are used as objects to display container information

diff --git a/scripts/werf-in-image/werf.yaml b/scripts/werf-in-image/werf.yaml
@@ -1,6 +1,6 @@
 project: werf-in-image
 configVersion: 1
-{{- $_ := set $ "Groups" (list "2") }}
+{{- $_ := set $ "Groups" (list "1.2" "2") }}
 {{- $_ := set $ "Channels" (list "alpha" "beta" "ea" "stable" "rock-solid") }}
 
 ---
@@ -26,7 +26,7 @@ shell:
         echo "Perform trdl update for werf {{ $group }} {{ $channel }} ..."
         trdl update werf {{ $group }} {{ $channel }}
         . $(trdl use werf {{ $group }} {{ $channel }})
-        REQUIRED_VERSION=$(cat /trdl_channels.yaml | yq e '.groups[] | select(.name | contains("{{ $group }}")) | .channels[] | select(.name | contains("{{ $channel }}")) | .version' -)
+        REQUIRED_VERSION=$(cat /trdl_channels.yaml | yq e '.groups[] | select(.name == "{{ $group }}") | .channels[] | select(.name == "{{ $channel }}") | .version' -)
         DOWNLOADED_VERSION=$(werf version | sed -e 's|^v||')
         echo "werf {{ $group }} {{ $channel }}: required version $REQUIRED_VERSION, downloaded version $DOWNLOADED_VERSION"
         [[ "$REQUIRED_VERSION" != "$DOWNLOADED_VERSION" ]] || break