upload-release FORCE=1

RedisJSON · Oct 6, 2023 · 07d8884 · 07d8884
1 parent 7955a1a
commit 07d8884
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/mariner2.yml b/.github/workflows/mariner2.yml
@@ -18,7 +18,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: 'recursive'
-          set-safe-directory: true
       - name: install dependencies
         run: |
           bash .install/mariner2.sh
@@ -34,12 +33,12 @@ jobs:
       - name: pack module
         run: |
           make pack BRANCH=${{ github.ref_name }}
-      - name: get aws
-        # TODO: New script .install/get_aws.sh?
-        run: |
-          bash ./deps/readies/bin/getaws
+      # - name: get aws
+      #   # TODO: New script .install/get_aws.sh?
+      #   run: |
+      #     bash ./deps/readies/bin/getaws
       - name: upload to staging
         run: |
-          make upload-release SHOW=1 STAGING=1
+          make upload-release SHOW=1 STAGING=1 FORCE=1
 
 # todo: upload artifacts to S3
diff --git a/.install/mariner2.sh b/.install/mariner2.sh
@@ -5,7 +5,15 @@ tdnf install -q -y build-essential git wget ca-certificates tar openssl-devel \
 
 pip install --upgrade setuptools
 pip install --upgrade pip
-pip install -r tests/pytest/requirements.txt
+pip install -q -r tests/pytest/requirements.txt
 
 # These packages are needed to build the package
-pip install addict toml jinja2 ramp-packer
+pip install -q addict toml jinja2 ramp-packer
+
+# Install aws-cli for uploading artifacts to s3
+curdir="$PWD"
+cd /tmp/
+curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+unzip awscliv2.zip
+./aws/install
+cd $curdir