diff --git a/.github/workflows/build-test-publish-apps.yml b/.github/workflows/build-apps.yml similarity index 68% rename from .github/workflows/build-test-publish-apps.yml rename to .github/workflows/build-apps.yml index 74dcf459a..3cb0b8168 100644 --- a/.github/workflows/build-test-publish-apps.yml +++ b/.github/workflows/build-apps.yml @@ -1,22 +1,20 @@ -name: build-publish-apps +name: build-apps on: pull_request: push: branches: - main - release: - types: [published] + tags: + - 'v[0-9]+.[0-9]+.[0-9]+' schedule: - cron: '0 4 * * *' # Daily at 04:00 AM UTC # Will checkout the last commit from the default branch (main as of 2023-10-04) env: - CUT_RELEASE_PR: ${{ github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }} - NIGHTLY: ${{ github.event_name == 'schedule' }} - BUILD_RELEASE: ${{ github.event_name == 'release' || github.event_name == 'schedule' || github.event_name == 'pull_request' && (contains(github.event.pull_request.title, 'Cut release v')) }} - NOTES: ${{ github.event_name == 'release' && github.event.release.body || format('Non-release build, commit {0}', github.sha) }} + IS_RELEASE: ${{ github.ref_type == 'tag' }} + IS_NIGHTLY: ${{ github.event_name == 'schedule' }} concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} @@ -27,6 +25,7 @@ jobs: runs-on: ubuntu-22.04 # seperate job on Ubuntu for easy string manipulations (compared to Windows) outputs: version: ${{ steps.export_version.outputs.version }} + notes: ${{ steps.export_notes.outputs.notes }} steps: - uses: actions/checkout@v4 @@ -48,16 +47,17 @@ jobs: - name: Run build:wasm run: "yarn build:wasm" - - name: Set nightly version, product name, and icons - if: ${{ env.NIGHTLY == 'true' }} + - name: Set nightly version, product name, release notes, and icons + if: ${{ env.IS_NIGHTLY == 'true' }} run: yarn files:flip-to-nightly - - name: Generate release notes + - name: Set release version + if: ${{ env.IS_RELEASE == 'true' }} run: | - echo "$NOTES" > release-notes.md - cat release-notes.md + export VERSION=${GITHUB_REF_NAME#v} + yarn files:set-version - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: prepared-files path: | @@ -71,13 +71,16 @@ jobs: - id: export_version run: echo "version=`cat package.json | jq -r '.version'`" >> "$GITHUB_OUTPUT" + - id: export_notes + run: echo "notes=`cat release-notes.md`" >> "$GITHUB_OUTPUT" + - name: Prepare electron-builder.yml file for updater test - if: ${{ env.CUT_RELEASE_PR == 'true' }} + if: ${{ env.IS_RELEASE == 'true' }} run: | yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/updater-test"' electron-builder.yml - - uses: actions/upload-artifact@v3 - if: ${{ env.CUT_RELEASE_PR == 'true' }} + - uses: actions/upload-artifact@v4 + if: ${{ env.IS_RELEASE == 'true' }} with: name: prepared-files-updater-test path: | @@ -102,7 +105,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 name: prepared-files - name: Copy prepared files @@ -128,7 +131,7 @@ jobs: - run: yarn tronb:vite - name: Prepare certificate and variables (Windows only) - if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }} + if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }} run: | echo "${{secrets.SM_CLIENT_CERT_FILE_B64 }}" | base64 --decode > /d/Certificate_pkcs12.p12 cat /d/Certificate_pkcs12.p12 @@ -143,7 +146,7 @@ jobs: shell: bash - name: Setup certicate with SSM KSP (Windows only) - if: ${{ env.BUILD_RELEASE == 'true' && matrix.os == 'windows-2022' }} + if: ${{ (env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true') && matrix.os == 'windows-2022' }} run: | curl -X GET https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download -H "x-api-key:%SM_API_KEY%" -o smtools-windows-x64.msi msiexec /i smtools-windows-x64.msi /quiet /qn @@ -154,13 +157,13 @@ jobs: shell: cmd - name: Build the app (debug) - if: ${{ env.BUILD_RELEASE == 'false' }} + if: ${{ env.IS_RELEASE == 'false' && env.IS_NIGHTLY == 'false' }} # electron-builder doesn't have a concept of release vs debug, # this is just not doing any codesign or release yml generation run: yarn electron-builder --config - name: Build the app (release) - if: ${{ env.BUILD_RELEASE == 'true' }} + if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }} env: PUBLISH_FOR_PULL_REQUEST: true APPLE_ID: ${{ secrets.APPLE_ID }} @@ -177,7 +180,7 @@ jobs: - name: List artifacts in out/ run: ls -R out - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: out-arm64-${{ matrix.platform }} # first two will pick both Zoo Modeling App-$VERSION-arm64-win.exe and Zoo Modeling App-$VERSION-win.exe @@ -187,7 +190,7 @@ jobs: out/*-arm64-mac.* out/*-arm64-linux.* - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: out-x64-${{ matrix.platform }} path: | @@ -195,27 +198,29 @@ jobs: out/*-x64-mac.* out/*-x86_64-linux.* - - uses: actions/upload-artifact@v3 - if: ${{ env.BUILD_RELEASE == 'true' }} + - uses: actions/upload-artifact@v4 + if: ${{ env.IS_RELEASE == 'true' || env.IS_NIGHTLY == 'true' }} with: - name: out-yml + name: out-yml-${{ matrix.platform }} path: | out/latest*.yml # TODO: add the 'Build for Mac TestFlight (nightly)' stage back - - uses: actions/download-artifact@v3 - if: ${{ env.CUT_RELEASE_PR == 'true' }} + # The steps below are for updater-test builds, only on release + + - uses: actions/download-artifact@v4 + if: ${{ env.IS_RELEASE == 'true' }} name: prepared-files-updater-test - name: Copy updated electron-builder.yml file for updater test - if: ${{ env.CUT_RELEASE_PR == 'true' }} + if: ${{ env.IS_RELEASE == 'true' }} run: | ls -R prepared-files-updater-test cp prepared-files-updater-test/electron-builder.yml electron-builder.yml - name: Build the app (updater-test) - if: ${{ env.CUT_RELEASE_PR == 'true' }} + if: ${{ env.IS_RELEASE == 'true' }} env: APPLE_ID: ${{ secrets.APPLE_ID }} APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }} @@ -228,8 +233,8 @@ jobs: WINDOWS_CERTIFICATE_THUMBPRINT: ${{ secrets.WINDOWS_CERTIFICATE_THUMBPRINT }} run: yarn electron-builder --config --publish always - - uses: actions/upload-artifact@v3 - if: ${{ env.CUT_RELEASE_PR == 'true' }} + - uses: actions/upload-artifact@v4 + if: ${{ env.IS_RELEASE == 'true' }} with: name: updater-test-arm64-${{ matrix.platform }} path: | @@ -237,8 +242,8 @@ jobs: out/*-arm64-mac.dmg out/*-arm64-linux.AppImage - - uses: actions/upload-artifact@v3 - if: ${{ env.CUT_RELEASE_PR == 'true' }} + - uses: actions/upload-artifact@v4 + if: ${{ env.IS_RELEASE == 'true' }} with: name: updater-test-x64-${{ matrix.platform }} path: | @@ -247,58 +252,69 @@ jobs: out/*-x86_64-linux.AppImage - publish-apps-release: + upload-apps-release: runs-on: ubuntu-22.04 permissions: contents: write - if: ${{ github.event_name == 'release' || github.event_name == 'schedule' }} - needs: [prepare-files, build-apps] + if: ${{ github.ref_type == 'tag' || github.event_name == 'schedule' }} env: VERSION_NO_V: ${{ needs.prepare-files.outputs.version }} VERSION: ${{ format('v{0}', needs.prepare-files.outputs.version) }} - PUB_DATE: ${{ github.event_name == 'release' && github.event.release.created_at || github.event.repository.updated_at }} - BUCKET_DIR: ${{ github.event_name == 'schedule' && 'dl.kittycad.io/releases/modeling-app/nightly' || 'dl.kittycad.io/releases/modeling-app' }} - WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }} - URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }} + needs: [prepare-files, build-apps] steps: - uses: actions/checkout@v4 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: out-arm64-win path: out - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: out-x64-win path: out - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 + with: + name: out-yml-win + path: out + + - uses: actions/download-artifact@v4 with: name: out-arm64-mac path: out - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: out-x64-mac path: out - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 + with: + name: out-yml-mac + path: out + + - uses: actions/download-artifact@v4 with: name: out-arm64-linux path: out - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: out-x64-linux path: out - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: - name: out-yml + name: out-yml-linux path: out - name: Generate the download static endpoint + env: + NOTES: ${{ needs.prepare-files.outputs.notes }} + PUB_DATE: ${{ github.event.repository.updated_at }} + WEBSITE_DIR: ${{ github.event_name == 'schedule' && 'dl.zoo.dev/releases/modeling-app/nightly' || 'dl.zoo.dev/releases/modeling-app' }} + URL_CODED_NAME: ${{ github.event_name == 'schedule' && 'Zoo%20Modeling%20App%20%28Nightly%29' || 'Zoo%20Modeling%20App' }} run: | RELEASE_DIR=https://${WEBSITE_DIR} jq --null-input \ @@ -335,78 +351,44 @@ jobs: "url": $linux_x64_url } } - }' > last_download.json - cat last_download.json + }' > out/last_download.json + cat out/last_download.json + + - uses: actions/upload-artifact@v4 + with: + name: out-download-json + path: out/last_download.json - name: List artifacts run: "ls -R out" - name: Authenticate to Google Cloud + if: ${{ env.IS_NIGHTLY == 'true' }} uses: 'google-github-actions/auth@v2.1.7' with: credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}' - name: Set up Google Cloud SDK + if: ${{ env.IS_NIGHTLY == 'true' }} uses: google-github-actions/setup-gcloud@v2.1.2 with: project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }} - - name: Upload release files to public bucket + - name: Upload nightly files to public bucket + if: ${{ env.IS_NIGHTLY == 'true' }} uses: google-github-actions/upload-cloud-storage@v2.2.1 with: path: out - glob: 'Zoo*' + glob: '*' parent: false - destination: ${{ env.BUCKET_DIR }} + destination: 'dl.kittycad.io/releases/modeling-app/nightly' - - name: Upload update endpoint to public bucket - uses: google-github-actions/upload-cloud-storage@v2.2.1 - with: - path: out - glob: 'latest*' - parent: false - destination: ${{ env.BUCKET_DIR }} - - - name: Upload download endpoint to public bucket - uses: google-github-actions/upload-cloud-storage@v2.2.1 - with: - path: last_download.json - destination: ${{ env.BUCKET_DIR }} - - - name: Upload release files to Github - if: ${{ github.event_name == 'release' }} + - name: Create draft release uses: softprops/action-gh-release@v2 + if: ${{ env.IS_RELEASE == 'true' }} with: + name: ${{ env.VERSION }} + tag_name: ${{ env.VERSION }} + draft: true + generate_release_notes: true files: 'out/Zoo*' - - - name: Invalidate bucket cache on latest*.yml and last_download.json files - run: | - gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/last_download.json" --async - gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-linux-arm64.yml" --async - gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-mac.yml" --async - gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest.yml" --async - - announce_release: - needs: [publish-apps-release] - runs-on: ubuntu-22.04 - if: github.event_name == 'release' - steps: - - name: Check out code - uses: actions/checkout@v4 - - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: '3.x' - - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install requests - - - name: Announce Release - env: - DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} - RELEASE_VERSION: ${{ github.event.release.tag_name }} - RELEASE_BODY: ${{ github.event.release.body}} - run: python public/announce_release.py diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml deleted file mode 100644 index 56ff55231..000000000 --- a/.github/workflows/create-release.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Create Release - -on: - push: - branches: - - main - -jobs: - create-release: - runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: read - if: contains(github.event.head_commit.message, 'Cut release v') - steps: - - uses: actions/github-script@v7 - name: Read Cut release PR info and create release - with: - script: | - const { owner, repo } = context.repo - const pulls = await github.rest.repos.listPullRequestsAssociatedWithCommit({ - owner, - repo, - commit_sha: context.sha, - }) - const { title, body } = pulls.data[0] - const version = title.split('Cut release ')[1] - - const result = await github.rest.repos.createRelease({ - owner, - repo, - body, - tag_name: version, - name: version, - draft: true, - }) - console.log(result) diff --git a/.github/workflows/publish-apps-release.yml b/.github/workflows/publish-apps-release.yml new file mode 100644 index 000000000..a34b7167c --- /dev/null +++ b/.github/workflows/publish-apps-release.yml @@ -0,0 +1,158 @@ +name: publish-apps-release + +on: + release: + types: [published] + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + publish-apps-release: + runs-on: ubuntu-22.04 + permissions: + contents: write + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-node@v4 + with: + node-version-file: '.nvmrc' + cache: 'yarn' + + - name: Find tag workflow id + id: tag_workflow_id + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + id=$(gh run ls --repo kittycad/modeling-app -w build-apps.yml --branch ${{ github.event.release.tag_name }} --json databaseId | jq '.[0].databaseId') + echo "id=$id" >> "$GITHUB_OUTPUT" + + - uses: actions/download-artifact@v4 + with: + name: out-arm64-win + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-x64-win + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-yml-win + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-arm64-mac + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-x64-mac + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-yml-mac + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-arm64-linux + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-x64-linux + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-yml-linux + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - uses: actions/download-artifact@v4 + with: + name: out-download-json + path: out + run-id: ${{ steps.tag_workflow_id.outputs.id }} + github-token: ${{ secrets.GITHUB_TOKEN }} + + - name: List artifacts + run: ls -R out + + - name: Override release notes + env: + NOTES: ${{ github.event.release.body }} + run: yarn files:set-notes + + - name: Authenticate to Google Cloud + uses: 'google-github-actions/auth@v2.1.7' + with: + credentials_json: '${{ secrets.GOOGLE_CLOUD_DL_SA }}' + + - name: Set up Google Cloud SDK + uses: google-github-actions/setup-gcloud@v2.1.2 + with: + project_id: ${{ env.GOOGLE_CLOUD_PROJECT_ID }} + + - name: Upload release files to public bucket + uses: google-github-actions/upload-cloud-storage@v2.2.1 + with: + path: out + glob: '*' + parent: false + destination: 'dl.kittycad.io/releases/modeling-app/test/new-workflow' + + - name: Invalidate bucket cache on latest*.yml and last_download.json files + run: | + gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/last_download.json" --async + gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-linux-arm64.yml" --async + gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest-mac.yml" --async + gcloud compute url-maps invalidate-cdn-cache dl-url-map --path="/releases/modeling-app/latest.yml" --async + + + announce_release: + needs: [publish-apps-release] + runs-on: ubuntu-22.04 + steps: + - name: Check out code + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: '3.x' + + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install requests + + - name: Announce Release + env: + DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} + RELEASE_VERSION: ${{ github.event.release.tag_name }} + RELEASE_BODY: ${{ github.event.release.body }} + run: python public/announce_release.py diff --git a/README.md b/README.md index bf538b7f1..2d4e08a22 100644 --- a/README.md +++ b/README.md @@ -128,45 +128,39 @@ Before you submit a contribution PR to this repo, please ensure that: ## Release a new version -#### 1. Bump the versions by running `./make-release.sh` +#### 1. Create a 'Cut release $VERSION' issue -The `./make-release.sh` script has git commands to pull main but to be sure you can run the following git commands to have a fresh `main` locally. +It will be used to document changelog discussions and release testing. + +https://github.com/KittyCAD/modeling-app/issues/new + +#### 2. Push a new tag + +Create a new tag and push it to the repo (eg. `v0.28.0` for `$VERSION`) ``` -git branch -D main -git checkout main -git pull origin -./make-release.sh -# Copy within the back ticks and paste the stdout of the change log -git push --set-upstream origin +VERSION=$(./scripts/semantic-release.sh) +git tag $VERSION +git push origin --tags ``` -That will create the branch with the updated json files for you: -- run `./make-release.sh` or `./make-release.sh patch` for a patch update; -- run `./make-release.sh minor` for minor; or -- run `./make-release.sh major` for major. +This will trigger the `build-apps` workflow, set the version, build & sign the apps, and generate release files as well as updater-test artifacts. -After it runs you should just need the push the branch and open a PR. - -#### 2. Create a Cut Release PR - -When you open the PR copy the change log from the output of the `./make-release.sh` script into the description of the PR. - -**Important:** Pull request title needs to be prefixed with `Cut release v` to build in release mode and a few other things to test in the best context possible, the intent would be for instance to have `Cut release v1.2.3` for the `v1.2.3` release candidate. - -The PR may then serve as a place to discuss the human-readable changelog and extra QA. The `make-release.sh` tool suggests a changelog for you too to be used as PR description, just make sure to delete lines that are not user facing. +Once the workflow succeeds, a draft release will be created at https://github.com/KittyCAD/modeling-app/releases. #### 3. Manually test artifacts from the Cut Release PR ##### Release builds -The release builds can be found under the `out-{platform}` zip, at the very bottom of the `build-publish-apps` summary page for each commit on this branch. +The release builds can be found under the `out-{arch}-{platform}` zip files, at the very bottom of the `build-apps` summary page for the workflow (triggered by the tag in 2.). -Manually test against this [list](https://github.com/KittyCAD/modeling-app/issues/3588) across Windows, MacOS, Linux and posting results as comments in the Cut Release PR. +Alternatively, the draft release will also include these builds. + +Manually test against this [list](https://github.com/KittyCAD/modeling-app/issues/3588) across Windows, MacOS, Linux and posting results as comments in the issue. ##### Updater-test builds -The other `build-publish-apps` output in Cut Release PRs is `updater-test-{platform}`. As we don't have a way to test this fully automatically, we have a semi-automated process. For macOS, Windows, and Linux, download the corresponding updater-test artifact file, install the app, run it, expect an updater prompt to a dummy v0.255.255, install it and check that the app comes back at that version. +The other `build-apps` output in the release `build-apps` workflow (triggered by 2.) is `updater-test-{arch}-{platform}`. It's a semi-automated process: for macOS, Windows, and Linux, download the corresponding updater-test artifact file, install the app, run it, expect an updater prompt to a dummy v0.255.255, install it and check that the app comes back at that version. The only difference with these builds is that they point to a different update location on the release bucket, with this dummy v0.255.255 always available. This helps ensuring that the version we release will be able to update to the next one available. @@ -182,18 +176,15 @@ If the prompt doesn't show up, start the app in command line to grab the electro ./Zoo Modeling App-{version}-{arch}-linux.AppImage ``` -#### 4. Merge the Cut Release PR +#### 4. Publish the release -This will kick the `create-release` action, that creates a _Draft_ release out of this Cut Release PR merge after less than a minute, with the new version as title and Cut Release PR as description. +Head over to https://github.com/KittyCAD/modeling-app/releases, paste in the changelog discussed in the issue, and publish the draft release created by the `build-apps` workflow from step 2. +A new Action kicks in at https://github.com/KittyCAD/modeling-app/actions, which can be found under `release` event filter. On success, the files will be uploaded to the public bucket and the announcement on Discord will be sent. -#### 5. Publish the release +#### 5. Close the issue -Head over to https://github.com/KittyCAD/modeling-app/releases, the draft release corresponding to the merged Cut Release PR should show up at the top as _Draft_. Click on it, verify the content, and hit _Publish_. - -#### 6. Profit - -A new Action kicks in at https://github.com/KittyCAD/modeling-app/actions, which can be found under `release` event filter. +If everything is well and the release is out to the public, the issue tracking the release shall be closed. ## Fuzzing the parser diff --git a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-win32.png b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-win32.png index 7e1c93340..a433001e0 100644 Binary files a/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-win32.png and b/e2e/playwright/snapshot-tests.spec.ts-snapshots/extrude-on-default-planes-should-be-stable-XY-1-Google-Chrome-win32.png differ diff --git a/make-release.sh b/make-release.sh deleted file mode 100755 index dcf00c56a..000000000 --- a/make-release.sh +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -if ! git diff-index --quiet HEAD --; then - echo "Please stash uncommitted changes before running release script" - exit 1 -fi - -git checkout main -git pull -git fetch --all - -# Get the latest semver tag from git -latest_tag=$(jq -r '.version' package.json) -latest_tag="v$latest_tag" - -# Print the latest semver tag -echo "Latest semver tag: $latest_tag" - -# Function to bump version numbers -bump_version() { - local version=$1 - local bump_type=$2 - local major=$(echo $version | cut -d '.' -f 1 | sed 's/v//') - local minor=$(echo $version | cut -d '.' -f 2) - local patch=$(echo $version | cut -d '.' -f 3) - - case "$bump_type" in - major) - major=$((major + 1)) - minor=0 - patch=0 - ;; - minor) - minor=$((minor + 1)) - patch=0 - ;; - *) - patch=$((patch + 1)) - ;; - esac - - echo "v${major}.${minor}.${patch}" -} - -# Determine the type of bump based on the argument -bump_type=${1:-patch} - -# Bump the version -new_version=$(bump_version $latest_tag $bump_type) - -# Print the new semver tag -echo "New semver tag: $new_version" -new_version_number=${new_version:1} -echo "New version number without 'v': $new_version_number" - - -git checkout -b "cut-release-$new_version" - -VERSION=$new_version_number yarn json:set-version - -git add package.json -git commit -m "Cut release $new_version" - -echo "" -echo "Versions has been bumped in relevant json files, a branch has been created and committed to." -echo "" -echo "What's left for you to do is, push the branch and make the release PR." -echo "" - -echo "Suggested changelog:" -echo "\`\`\`" -echo "## What's Changed" -git log $(git describe --tags --match="v[0-9]*" --abbrev=0)..HEAD --oneline --pretty=format:%s | grep -v Bump | grep -v 'Cut release v' | awk '{print "* "toupper(substr($0,0,1))substr($0,2)}' -echo "" -echo "**Full Changelog**: https://github.com/KittyCAD/modeling-app/compare/${latest_tag}...${new_version}" -echo "\`\`\`" -echo "and would recommend removing ones that aren't related to the product (eg. CI changes)" diff --git a/package.json b/package.json index 934a25086..c0ecebba8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "zoo-modeling-app", - "version": "0.27.0", + "version": "0.0.0", "private": true, "productName": "Zoo Modeling App", "author": { @@ -93,6 +93,7 @@ "lint-fix": "eslint --fix src e2e packages/codemirror-lsp-client", "lint": "eslint --max-warnings 0 src e2e packages/codemirror-lsp-client", "files:set-version": "echo \"$(jq --arg v \"$VERSION\" '.version=$v' package.json --indent 2)\" > package.json", + "files:set-notes": "./scripts/set-files-notes.sh", "files:flip-to-nightly": "./scripts/flip-files-to-nightly.sh", "postinstall": "yarn fetch:samples && yarn xstate:typegen && ./node_modules/.bin/electron-rebuild", "xstate:typegen": "yarn xstate typegen \"src/**/*.ts?(x)\"", diff --git a/scripts/flip-files-to-nightly.sh b/scripts/flip-files-to-nightly.sh index b617514d7..7b054a8c0 100755 --- a/scripts/flip-files-to-nightly.sh +++ b/scripts/flip-files-to-nightly.sh @@ -1,13 +1,19 @@ #!/bin/bash +export VERSION=$(date +'%-y.%-m.%-d') +export COMMIT=$(git rev-parse --short HEAD) + # package.json -VERSION=$(date +'%-y.%-m.%-d') yarn files:set-version +yarn files:set-version echo "$(jq --arg name 'Zoo Modeling App (Nightly)' '.productName=$name' package.json --indent 2)" > package.json # electron-builder.yml yq -i '.publish[0].url = "https://dl.zoo.dev/releases/modeling-app/nightly"' electron-builder.yml yq -i '.appId = "dev.zoo.modeling-app-nightly"' electron-builder.yml +# Release notes +echo "Nightly build $VERSION (commit $COMMIT)" > release-notes.md + # icons cp assets/icon-nightly.png assets/icon.png cp assets/icon-nightly.ico assets/icon.ico diff --git a/scripts/semantic-release.sh b/scripts/semantic-release.sh new file mode 100755 index 000000000..085989ef9 --- /dev/null +++ b/scripts/semantic-release.sh @@ -0,0 +1,43 @@ +# Requires access to an environment variable GH_TOKEN +# If you are in the path of the git repository the gh release list will automatically point to that git repo +# aka cd /some/path/modeling-app +# $ gh release list +# Get the latest semver tag from git +latest_tag=$(gh release list --json name,isLatest --jq '.[] | select(.isLatest)|.name') + +# Function to bump version numbers +bump_version() { + local version=$1 + local bump_type=$2 + local major=$(echo $version | cut -d '.' -f 1 | sed 's/v//') + local minor=$(echo $version | cut -d '.' -f 2) + local patch=$(echo $version | cut -d '.' -f 3) + + case "$bump_type" in + major) + major=$((major + 1)) + minor=0 + patch=0 + ;; + minor) + minor=$((minor + 1)) + patch=0 + ;; + *) + patch=$((patch + 1)) + ;; + esac + + echo "v${major}.${minor}.${patch}" +} + +# Determine the type of bump based on the argument +bump_type=${1:-minor} + +# Bump the version +new_version=$(bump_version $latest_tag $bump_type) + +# Print the new semver tag +# Example output v0.27.1 +# Yes it will include the v at the start +echo $new_version diff --git a/scripts/set-files-notes.sh b/scripts/set-files-notes.sh new file mode 100755 index 000000000..8b1daa9bf --- /dev/null +++ b/scripts/set-files-notes.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +yq -i '.releaseNotes = strenv(NOTES)' out/latest-linux-arm64.yml +yq -i '.releaseNotes = strenv(NOTES)' out/latest-linux.yml +yq -i '.releaseNotes = strenv(NOTES)' out/latest-mac.yml +yq -i '.releaseNotes = strenv(NOTES)' out/latest.yml + +NEW_JSON=`jq --arg n "$NOTES" '.notes=$n' out/last_download.json --indent 2` +echo "$NEW_JSON" > out/last_download.json