Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
187 changes: 0 additions & 187 deletions .circleci/config.yml

This file was deleted.

1 change: 1 addition & 0 deletions .github/actions/yarn/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ runs:
uses: actions/setup-node@3235b876344d2a9aa001b8d1453c930bba69e610
with:
node-version-file: .nvmrc
cache: 'yarn'

- name: Install dependencies
shell: bash
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,6 @@ jobs:
runs-on: ubuntu-latest
if: github.ref != 'refs/heads/main'
steps:
- name: Wait for CI build
uses: fountainhead/[email protected]
id: wait-for-build
with:
token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
checkName: build-test
ref: ${{ github.event.pull_request.head.sha || github.sha }}
timeoutSeconds: 1200
intervalSeconds: 30
Comment on lines -23 to -31
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Image

changed the required checks to the following, so shouldn't need this anymore

Copy link
Contributor Author

@dreamwasp dreamwasp Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

& pr-title

- name: automerge
uses: pascalgn/[email protected]
env:
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: Deploy Production Storybook

on:
push:
branches:
- main

env:
NODE_OPTIONS: '--max_old_space_size=8196'
NX_CLOUD: false
IGNORE_COMMIT_MESSAGE: 'chore(release): publish'

permissions:
id-token: write
contents: write

concurrency:
group: deploy-production
cancel-in-progress: false

jobs:
deploy:
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}

- name: Skip build from automated commit
uses: ./.github/actions/skip-automated-commits
with:
ignore-commit-message: ${{ env.IGNORE_COMMIT_MESSAGE }}

- name: Setup and Build
uses: ./.github/actions/yarn

- name: Cache Nx
uses: actions/cache@v4
with:
path: node_modules/.cache/nx
key: nx-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-${{ github.ref_name }}-${{ github.run_id }}
restore-keys: |
nx-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-${{ github.ref_name }}-
nx-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-
nx-${{ runner.os }}-

- name: Cache webpack
uses: actions/cache@v4
with:
path: |
node_modules/.cache
packages/styleguide/node_modules/.cache
key: webpack-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-${{ github.ref_name }}-${{ github.sha }}
restore-keys: |
webpack-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-${{ github.ref_name }}-
webpack-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-

- name: Set git user
uses: ./.github/actions/set-git-user

- name: Build All Packages
run: yarn build

- name: Build Storybook
run: yarn nx run styleguide:build-storybook

- name: Deploy to GitHub Pages
run: yarn deploy
env:
GITHUB_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
67 changes: 67 additions & 0 deletions .github/workflows/publish-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Publish Production

on:
push:
branches:
- main

env:
NODE_VERSION: '22.13.1'
NODE_OPTIONS: '--max_old_space_size=8196'
NX_CLOUD: false
IGNORE_COMMIT_MESSAGE: 'chore(release): publish'

permissions:
id-token: write
contents: write
pull-requests: write
issues: write

concurrency:
group: publish-production
cancel-in-progress: false

jobs:
publish:
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}

- name: Skip build from automated commit
uses: ./.github/actions/skip-automated-commits
with:
ignore-commit-message: ${{ env.IGNORE_COMMIT_MESSAGE }}

- name: Setup and Build
uses: ./.github/actions/yarn

- name: Cache Nx
uses: actions/cache@v4
with:
path: node_modules/.cache/nx
key: nx-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-${{ github.ref_name }}-${{ github.run_id }}
restore-keys: |
nx-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-${{ github.ref_name }}-
nx-${{ runner.os }}-${{ hashFiles('yarn.lock') }}-
nx-${{ runner.os }}-

- name: Set git user
uses: ./.github/actions/set-git-user

- name: Set npm token
uses: ./.github/actions/set-npm-token
with:
token-secret: ${{ secrets.NODE_AUTH_TOKEN }}

- name: Build All Packages
run: yarn build

- name: Lerna Publish
run: yarn lerna publish --yes --exact --conventional-commits --changelog-preset conventionalcommits --include-merged-tags --create-release=github
env:
GH_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ _The component library & design system for Codecademy._ ✨

---

[![CircleCI](https://circleci.com/gh/Codecademy/gamut.svg?style=svg&circle-token=3d9adfca5a8b44e7297ceb18e032e89a11d223a2)](https://circleci.com/gh/Codecademy/gamut)
[![GitHub Actions](https://github.com/Codecademy/gamut/workflows/Test%20Suite/badge.svg)](https://github.com/Codecademy/gamut/actions)

This repository is a monorepo that we manage using [Lerna](https://lerna.js.org/). That means that we publish several packages to npm from the same codebase, including:

Expand Down Expand Up @@ -70,7 +70,7 @@ We provide a single package to manage the versions of a few core dependencies: `
1. After your code has been reviewed and tested, you can merge your branch into main.
1. Make sure to update your PR title and add a short description of your changes for the changelog (see the [PR Title Guide](https://github.com/Codecademy/gamut#pr-title-guide))
1. To merge your changes, add the `Ship It` label to your Pull Request.
1. Once your branch is merged into main, it will be published automatically by CircleCI.
1. Once your branch is merged into main, it will be published automatically by GitHub Actions.
1. You can find the new version number on npmjs.com/package/<package-name>, or find it in that package's `package.json` on the `main` branch

### Publishing an alpha version of a module
Expand All @@ -80,7 +80,7 @@ Every PR that changes files in a package publishes alpha releases that you can u
> NOTE: in case an alpha build is not published upon opening of the PR or Draft PR, re-run the `build-test` check and that will re-run the alpha build publishing flows

1. Create a PR or Draft PR.
- This will kickoff a Circle-CI workflow which will publish an alpha build. (This will appear in Github as the "Deploy")
- This will kickoff a Github Action workflow which will publish an alpha build. (This will appear in Github as the "Deploy")
1. After the alpha build is published, the `codecademydev` bot should comment on your PR with the names of the published alpha packages. <br/>
<img width="290" height="auto" src="https://user-images.githubusercontent.com/4298857/114948632-3fa88a80-9e04-11eb-89ef-d016a1c9c572.png">
1. Install this version of the package in your application you wish to test your changes on.
Expand Down
4 changes: 2 additions & 2 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"namedInputs": {
"babelConfig": ["{workspaceRoot}/babel.defaults.js"],
"ci": [
"{workspaceRoot}/.circleci/config.yml",
"{workspaceRoot}/.github/push.yml"
"{workspaceRoot}/.github/workflows/**/*.yml",
"{workspaceRoot}/.github/actions/**/*.yml"
],
"default": ["{projectRoot}/**/*"],
"production": [
Expand Down
2 changes: 1 addition & 1 deletion packages/gamut/src/Badge/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const sizeVariants = variant({
},
sm: {
height: `1rem`,
// the powers that be told us this was okay. please don't do this. seriously. - <3 web-plat
// The powers that be told us this was okay. Please don't do this. Seriously. - <3 Web-Plat
fontSize: 10 as any,
},
},
Expand Down
Loading
Loading