Merge pull request #48 from vaikas/release-18

Remove the ARM specific release as that's no longer necessary.
sigstore · Feb 26, 2022 · 7ff93d8 · 7ff93d8
2 parents 1620cdf + 61d086c
commit 7ff93d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 31 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -72,13 +72,6 @@ jobs:
         # Build a big bundle of joy, this also produces SBOMs
         ko resolve --tags $(basename "${{ github.ref }}" ),latest -BRf ./config --platform=all --image-refs imagerefs > release.yaml
 
-        # arm64 uses mysql/mysql-server but it doesn't seem to work correctly
-        # as is in github actions, because it wants to change the filesystem.
-        # TODO(vaikas): Find a way to use the same image, for now, hack and
-        # use different image for amd and arm until I sort it out.
-        # https://github.com/vaikas/sigstore-scaffolding/issues/28
-        sed -e 's@mysql:8.0@mysql/mysql-server:8.0@' release.yaml > release-arm.yaml
-
         echo "Doing ko resolve for testdata"
         # Build a big bundle of test joy, this also produces SBOMs
         ko resolve --tags $(basename "${{ github.ref }}" ),latest -BRf ./testdata --platform=all --image-refs testimagerefs > testrelease.yaml
@@ -99,16 +92,6 @@ jobs:
         asset_name: release.yaml
         asset_content_type: text/plain
 
-    - name: Upload Core ARM Asset
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GH_REPO_PAT }}
-      with:
-        upload_url: ${{ steps.get_release_url.outputs.upload_url }}
-        asset_path: ./src/github.com/${{ github.repository }}/release-arm.yaml
-        asset_name: release-arm.yaml
-        asset_content_type: text/plain
-
     - name: Upload Test Asset
       uses: actions/upload-release-asset@v1
       env:

diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml
@@ -31,7 +31,7 @@ jobs:
 
     env:
       KNATIVE_VERSION: "1.1.0"
-      RELEASE_VERSION: "v0.1.16"
+      RELEASE_VERSION: "v0.1.18"
       KO_DOCKER_REPO: registry.local:5000/knative
       KOCACHE: ~/ko
 

diff --git a/getting-started.md b/getting-started.md
@@ -27,7 +27,7 @@ cloning the repo):
 
 Or by downloading a release version of the script
 ```shell
-curl -Lo /tmp/setup-kind.sh https://github.com/vaikas/sigstore-scaffolding/releases/download/v0.1.16/setup-kind.sh
+curl -Lo /tmp/setup-kind.sh https://github.com/vaikas/sigstore-scaffolding/releases/download/v0.1.18/setup-kind.sh
 chmod u+x /tmp/setup-kind.sh
 /tmp/setup-kind.sh
 ```
@@ -62,19 +62,9 @@ docker rm -f b1e3f3238f7a
 # Install sigstore-scaffolding pieces
 
 ```shell
-curl -L https://github.com/vaikas/sigstore-scaffolding/releases/download/v0.1.16/release.yaml | kubectl apply -f -
+curl -L https://github.com/vaikas/sigstore-scaffolding/releases/download/v0.1.18/release.yaml | kubectl apply -f -
 ```
 
-Or for Arm64 based (M1 for example):
-
-```shell
-curl -L https://github.com/vaikas/sigstore-scaffolding/releases/download/v0.1.16/release-arm.yaml | kubectl apply -f -
-```
-
-The reason for different releases is the mysql binary used in the Intel based
-release does not have Arm64 version.
-
-
 # Then wait for the jobs that setup dependencies to finish
 
 ```shell
@@ -140,7 +130,7 @@ kubectl -n ctlog-system get secrets ctlog-public-key -oyaml | sed 's/namespace:
 
 2) Create the two test jobs (checktree and check-oidc)  using this yaml (this may take a bit, since the two jobs are launched simultaneously)
 ```shell
-curl -L https://github.com/vaikas/sigstore-scaffolding/releases/download/v0.1.16/testrelease.yaml | kubectl apply -f -
+curl -L https://github.com/vaikas/sigstore-scaffolding/releases/download/v0.1.18/testrelease.yaml | kubectl apply -f -
 ```
 
 3) To view if jobs have completed