diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..65183cf --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +/resources/dist/**/* linguist-generated=true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e81d7d2..00952e9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,28 +1,71 @@ name: Create Release on: # zizmor: ignore[concurrency-limits] - push: - tags: - - 'v*' + workflow_dispatch: + inputs: + version: + description: 'Release version, without the v prefix (e.g. 1.2.0)' + required: true + type: string permissions: {} jobs: - build: # zizmor: ignore[anonymous-definition] + release: + name: Create Release runs-on: ubuntu-latest - permissions: - contents: write # create GitHub release and upload assets + environment: Releases + permissions: {} # all writes go through the App token; GITHUB_TOKEN needs no scopes steps: - - name: Checkout code - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0 + - name: Resolve and validate version + env: + INPUT_VERSION: ${{ inputs.version }} + BRANCH: ${{ github.ref_name }} + run: | + version="${INPUT_VERSION#v}" + + if [[ ! "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-[0-9A-Za-z.]+)?$ ]]; then + echo "::error::Version must look like 1.2.0 (got: $INPUT_VERSION)" + exit 1 + fi + + if [[ "$BRANCH" =~ ^[0-9]+\.x$ ]] && [ "${version%%.*}" != "${BRANCH%%.*}" ]; then + echo "::error::Version $version does not belong on the $BRANCH branch" + exit 1 + fi + + echo "TAG=v$version" >> "$GITHUB_ENV" + + - name: Get release bot token + id: app-token + uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0 + with: + client-id: ${{ secrets.RELEASE_APP_CLIENT_ID }} + private-key: ${{ secrets.RELEASE_APP_PRIVATE_KEY }} + permission-contents: write + + - name: Checkout + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: - persist-credentials: false + token: ${{ steps.app-token.outputs.token }} + persist-credentials: true # zizmor: ignore[artipacked] App token is needed to push the tag + + - name: Assert tag does not already exist + run: | + existing="$(git ls-remote --tags origin "$TAG")" + [ -z "$existing" ] || { echo "::error::Tag $TAG already exists on remote. Aborting."; exit 1; } - name: Setup PHP uses: shivammathur/setup-php@f3e473d116dcccaddc5834248c87452386958240 # 2.37.2 with: php-version: '8.5' + - name: Use Node.js 20.19.0 + uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 + with: + node-version: 20.19.0 + package-manager-cache: false + - name: Install Composer dependencies uses: nick-invision/retry@ad984534de44a9489a53aefd81eb77f87c70dc60 # v4.0.0 with: @@ -30,28 +73,47 @@ jobs: max_attempts: 5 command: composer install --no-interaction --prefer-dist - - name: Install dependencies + - name: Install NPM dependencies run: npm ci - - name: Compile assets + - name: Build release assets run: npm run build - - name: Create zip - run: cd resources && tar -czvf dist.tar.gz dist + - name: Create the build commit + env: + GH_TOKEN: ${{ steps.app-token.outputs.token }} + APP_SLUG: ${{ steps.app-token.outputs.app-slug }} + run: | + USER_ID="$(gh api "/users/${APP_SLUG}[bot]" --jq .id)" + git config user.name "${APP_SLUG}[bot]" + git config user.email "${USER_ID}+${APP_SLUG}[bot]@users.noreply.github.com" + git add --force resources/dist + git commit -m "Build assets for $TAG" + + - name: Tag and push the build commit + run: | + git tag "$TAG" + git push origin "$TAG" - name: Get Changelog id: changelog - uses: statamic/changelog-action@5d112d0d790cdeeb5adca3e584e37edc474ab51b # v1 + uses: statamic/changelog-action@5d112d0d790cdeeb5adca3e584e37edc474ab51b # v1.0.2 with: - version: ${{ github.ref }} + version: ${{ env.TAG }} - name: Create release env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - RELEASE_VERSION: ${{ steps.changelog.outputs.version }} + GH_TOKEN: ${{ steps.app-token.outputs.token }} RELEASE_NOTES: ${{ steps.changelog.outputs.text }} + IS_DEFAULT_BRANCH: ${{ github.ref_name == github.event.repository.default_branch }} run: | - gh release create "$RELEASE_VERSION" \ - --title "$RELEASE_VERSION" \ + latest="$IS_DEFAULT_BRANCH" + prerelease=false + case "$TAG" in + *-*) prerelease=true; latest=false ;; + esac + gh release create "$TAG" \ + --title "$TAG" \ --notes "$RELEASE_NOTES" \ - ./resources/dist.tar.gz + --latest="$latest" \ + --prerelease="$prerelease" diff --git a/composer.json b/composer.json index 9f22d75..289a389 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,7 @@ "description": "Real-time collaboration and multi-user authoring for Statamic Pro.", "license": "proprietary", "require": { - "statamic/cms": "^6.15.0", - "pixelfear/composer-dist-plugin": "^0.1.6" + "statamic/cms": "^6.15.0" }, "extra": { "laravel": { @@ -16,20 +15,11 @@ "statamic": { "name": "Collaboration", "description": "Real-time collaboration and multi-user authoring for Statamic Pro." - }, - "download-dist": { - "url": "https://github.com/statamic/collaboration/releases/download/{$version}/dist.tar.gz", - "path": "resources/dist" } }, "autoload": { "psr-4": { "Statamic\\Collaboration\\": "src" } - }, - "config": { - "allow-plugins": { - "pixelfear/composer-dist-plugin": true - } } }