SCALRCORE-21545 > Replace release with build

Scalr · May 10, 2022 · b65dd54 · b65dd54
1 parent 732f692
commit b65dd54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
@@ -72,7 +72,7 @@ jobs:
           container_id: ${{ steps.create.outputs.container_id }}
   upload-dev:
     name: upload-dev
-    needs: [lint, unit-tests, acc-tests]
+    # needs: [lint, unit-tests, acc-tests]
     runs-on: ubuntu-latest
     steps:
       - name: Import GPG key
@@ -91,15 +91,20 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+      - name: Create dev-tag
+        run: |
+          LAST_TAG=$(git describe --tags --abbrev=0)
+          BRANCH=$(git rev-parse --abbrev-ref HEAD | sed 's|\(.*\)|\L\1|g;s|/|-|g')
+          git tag $LAST_TAG-$BRANCH
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
           go-version: "1.17"
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2
         with:
-          version: latest
-          args: release --rm-dist
+          version: v1.8.3
+          args: build --skip-validate
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GPG_FINGERPRINT: ${{ steps.import_gpg.outputs.fingerprint }}

diff --git a/scripts/upload.sh b/scripts/upload.sh
@@ -10,13 +10,8 @@ PROVIDER_SOURCE="scalr/scalr"
 URL="https://$DOMAIN"
 PROTOCOLS="[\"5.0\"]"
 
-# If tag is not defined, use branch name as version
 VERSION=$(PAGER= git tag --points-at HEAD)
-if [ -z "$VERSION" ]; then
-    VERSION=$(git rev-parse --abbrev-ref HEAD | sed 's|\(.*\)|\L\1|g;s|/|-|g')
-else
-    VERSION=${VERSION:1}
-fi
+VERSION=${VERSION:1}
 
 TMP_DIR=$(mktemp -d -t scalr-provider-$VERSION-XXXXXXXXXXX)
 PROVIDER_BIN_PATH=$TMP_DIR/$PROVIDER_NAME/$VERSION