From ff21817dab8aa3c56963d80f006ac019f16750f7 Mon Sep 17 00:00:00 2001 From: Julian Skinner Date: Mon, 14 Oct 2024 10:30:53 -0500 Subject: [PATCH] ci: cleanup and prepare for release --- .github/labeler.yml | 2 - .github/workflows/publish.yml | 2 +- .github/workflows/rebrand-mercury-rising.yml | 75 -------------------- .github/workflows/release-please.yml | 43 ----------- lerna.json | 2 +- 5 files changed, 2 insertions(+), 122 deletions(-) delete mode 100644 .github/labeler.yml delete mode 100644 .github/workflows/rebrand-mercury-rising.yml delete mode 100644 .github/workflows/release-please.yml diff --git a/.github/labeler.yml b/.github/labeler.yml deleted file mode 100644 index e0994a9b6f..0000000000 --- a/.github/labeler.yml +++ /dev/null @@ -1,2 +0,0 @@ -mercury-rising: -- base-branch: ['mercury-rising'] diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 915ede09c6..6a809058dc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -4,7 +4,7 @@ on: push: branches: - main - # - develop - Uncomment this line to enable publishing from the develop branch. On hold until Mercury-Rising is complete. + - develop jobs: lint-test-build: diff --git a/.github/workflows/rebrand-mercury-rising.yml b/.github/workflows/rebrand-mercury-rising.yml deleted file mode 100644 index 227a6711c1..0000000000 --- a/.github/workflows/rebrand-mercury-rising.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: Rebrand Mercury-Rising -on: - workflow_dispatch: - - -jobs: - lint-test-build: - uses: ./.github/workflows/lint-test-build.yml - - publish: - needs: [lint-test-build] - runs-on: ubuntu-latest - - steps: - # # Setup Auth token to push to github packages - - name: Set NPM Config - run: npm config set '//npm.pkg.github.com/:_authToken=${{ secrets.ACCESS_TOKEN }}' - - - name: Add safe directory - run: git config --global --add safe.directory /__w/sage-lib/sage-lib - - - name: Clone Sage-Lib Repo - uses: actions/checkout@v4 - with: - # pulls all commits (needed for lerna / semantic release to correctly version) - fetch-depth: "0" - ref: "mercury-rising" - - # Setup Git Credentials to come from the Bot - - name: Set Bot Email - run: git config user.email "dev+github-bot@kajabi.com" - - - name: Set Bot Name - run: git config user.name "Kajabi Automation Bot" - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - with: - version: v0.9.1 - - - name: Setup Ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: '2.7.7' - - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: 18 - registry-url: https://npm.pkg.github.com - - - name: Yarn Install - run: yarn install --frozen-lockfile - - - name: Build - run: NODE_OPTIONS=--openssl-legacy-provider yarn build - - - name: Lerna Boostrap - run: yarn lerna bootstrap --ci - - - name: Set PreId - id: set_preid - run: echo "preid='rc'" >> $GITHUB_OUTPUT - - - name: Lerna Version Develop - run: NODE_OPTIONS=--openssl-legacy-provider yarn lerna publish --canary --yes --preid mercury --pre-dist-tag next - env: - NODE_AUTH_TOKEN: ${{ secrets.ACCESS_TOKEN }} - - - deploy: - needs: publish - if: github.ref == 'refs/heads/mercury-rising' - uses: ./.github/workflows/release-deploy.yml - secrets: inherit diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml deleted file mode 100644 index bfae931d2f..0000000000 --- a/.github/workflows/release-please.yml +++ /dev/null @@ -1,43 +0,0 @@ -# Disabling until work through missing steps -# 1. Updating Docs -# a. lib/sage_rails/lib/sage_rails/version.rb -# b. package.json -# 2. Updating "dependency" packages -# a. sage-react: "@kajabi/sage-assets" -# b. docs: "@kajabi/sage-packs" -# c. packs: "@kajabi/sage-assets", "@kajabi/sage-react", "@kajabi/sage-system" -name: release-please - -on: - workflow_dispatch: - -permissions: - contents: write - pull-requests: write - -jobs: - release-please: - runs-on: ubuntu-latest - outputs: - paths_released: ${{ steps.manifest-release.outputs.paths_released }} - steps: - - uses: google-github-actions/release-please-action@v3 - id: manifest-release - with: - command: manifest - monorepo-tags: true - default-branch: develop - changelog-types: '[{"type":"feat","section":"🚀 Features","hidden":false},{"type":"fix","section":"🐛 Bug Fixes","hidden":false},{"type":"docs", "section": "📝 Documentation Updates","hidden":false}]' - - - name: Show output from Release-Please - if: ${{ steps.manifest-release.outputs.release_created }} - run: | - echo "releases_created: ${{ steps.manifest-release.outputs.releases_created }}" - echo "upload_url: ${{ steps.manifest-release.outputs.upload_url }}" - echo "html_url: ${{ steps.manifest-release.outputs.html_url }}" - echo "tag_name: ${{ steps.manifest-release.outputs.tag_name }}" - echo "major: ${{ steps.manifest-release.outputs.major }}" - echo "minor: ${{ steps.manifest-release.outputs.minor }}" - echo "patch: ${{ steps.manifest-release.outputs.patch }}" - echo "sha: ${{ steps.manifest-release.outputs.sha }}" - echo "pr: ${{ steps.manifest-release.outputs.pr }}" diff --git a/lerna.json b/lerna.json index 5bdfc79df0..61bb73671f 100644 --- a/lerna.json +++ b/lerna.json @@ -11,7 +11,7 @@ "conventionalCommits": true, "message": "chore(release): publish [skip ci]", "registry": "https://npm.pkg.github.com", - "allowBranch": ["main", "develop", "mercury-rising"] + "allowBranch": ["main", "develop"] } } }