diff --git a/.changeset/config.json b/.changeset/config.json index cf6498b5b7..cb202fcc73 100644 --- a/.changeset/config.json +++ b/.changeset/config.json @@ -6,5 +6,5 @@ ], "commit": false, "access": "public", - "baseBranch": "develop" + "baseBranch": "v2" } diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 97c04e69fd..a1a7d96ab1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,9 +2,9 @@ name: CI on: push: - branches: [develop, beta] + branches: [v2, main] pull_request: - branches: [develop, beta] + branches: [v2, main] jobs: build-and-test: @@ -50,11 +50,9 @@ jobs: release: name: Release (latest or beta) - if: github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/beta' + if: github.ref == 'refs/heads/v2' || github.ref == 'refs/heads/main' needs: [build-and-test] runs-on: ubuntu-latest - outputs: - published: ${{ steps.changesets.outputs.published }} steps: - uses: actions/checkout@v5 - name: Setup Node.js environment @@ -74,8 +72,8 @@ jobs: publish: npm run release title: "chore(new-release)" commit: "chore(new-release)" - branch: ${{ github.ref == 'refs/heads/beta' && 'beta' || null }} - createGithubReleases: ${{ github.ref == 'refs/heads/develop' }} + branch: ${{ github.ref == 'refs/heads/main' && 'main' || null }} + createGithubReleases: ${{ github.ref == 'refs/heads/v2' }} env: GITHUB_TOKEN: ${{ secrets.STACKS_TOOLING_GH_RW_PAT }} NPM_TOKEN: ${{ secrets.NPM_API_KEY }} @@ -92,24 +90,6 @@ jobs: This is a technical user which does not trigger actions workflows on push events. See this GH issue for more details: https://github.com/changesets/action/issues/187 - update-docs: - name: Update main site stackoverflow.design - if: ${{ needs.release.outputs.published == 'true' && github.ref == 'refs/heads/develop' }} - needs: [build-and-test, release] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v5 - - name: 🔄 Update stackoverflow.design docs - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' - git fetch origin - git checkout production - git merge --no-ff --allow-unrelated-histories origin/develop -m "chore: merge develop into production" - git push origin production - env: - GITHUB_TOKEN: ${{ secrets.STACKS_TOOLING_GH_RW_PAT }} - # cancel the jobs if another workflow is kicked off for the same branch concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/netlify.toml b/netlify.toml index 3c107dee53..1a71b2b372 100644 --- a/netlify.toml +++ b/netlify.toml @@ -11,102 +11,4 @@ # IMPORTANT!: Git LFS settings can't be changed in the .toml file. You will need to set this environment # variable through the Netlify UI otherwise netlify won't be able to clone the repo due to all our images. # https://docs.netlify.com/build/configure-builds/environment-variables/#netlify-configuration-variables - GIT_LFS_ENABLED = "true" # just here as a reminder - -# Renamed pages -[[redirects]] - from = "/product/base/grid" - to = "/product/base/flex" - -[[redirects]] - from = "/product/base/pointer-events" - to = "/product/base/interactivity" - -[[redirects]] - from = "/product/guidelines/releasing/" - to = "https://github.com/StackExchange/Stacks#release-a-new-version-of-stacks" - -[[redirects]] - from = "/assets/img/logo-stacks@2x.png" - to = "/assets/img/logos/so/logo-stacks@2x.png" - -# Brand & copywriting → new site -[[redirects]] - from = "/content" - to = "https://stackoverflow.design/copy" - status = 302 - -[[redirects]] - from = "/content/guidelines/principles" - to = "https://stackoverflow.design/copy" - status = 302 - -[[redirects]] - from = "/content/guidelines/voice-and-tone" - to = "https://stackoverflow.design/copy/voice" - status = 302 - -[[redirects]] - from = "/content/guidelines/grammar-and-mechanics/" - to = "https://stackoverflow.design/copy/styleguide#grammar-and-mechanics" - status = 302 - -[[redirects]] - from = "/content/examples/alt-text/" - to = "https://stackoverflow.design/system/accessibility/alt" - status = 302 - -[[redirects]] - from = "/content/examples/error-messages/" - to = "https://stackoverflow.design/copy/patterns/messages#error-messages" - status = 302 - -[[redirects]] - from = "/content/examples/preferences-settings/" - to = "https://stackoverflow.design/copy/patterns/settings" - status = 302 - -[[redirects]] - from = "/content/examples/success-messages/" - to = "https://stackoverflow.design/copy/patterns/messages#success-messages" - status = 302 - -[[redirects]] - from = "/brand" - to = "https://stackoverflow.design/brand" - status = 302 - -[[redirects]] - from = "/brand/colors" - to = "https://stackoverflow.design/brand/color" - status = 302 - -[[redirects]] - from = "/brand/copywriting/concepts" - to = "https://stackoverflow.design/copy/styleguide#post-scores" - status = 302 - -[[redirects]] - from = "/brand/copywriting/naming" - to = "https://stackoverflow.design/copy/naming" - status = 302 - -[[redirects]] - from = "/brand/data-visualization" - to = "https://stackoverflow.design/brand" - status = 302 - -[[redirects]] - from = "/brand/logo" - to = "https://stackoverflow.design/brand/logo" - status = 302 - -[[redirects]] - from = "/brand/typography" - to = "https://stackoverflow.design/brand/typography" - status = 302 - -[[redirects]] - from = "/brand/principles" - to = "https://stackoverflow.design/copy/voice" - status = 302 + GIT_LFS_ENABLED = "true" # just here as a reminder \ No newline at end of file