Skip to content

Commit

Permalink
Merge pull request #5375 from matthewgallo/update-branch-naming-v1-ci
Browse files Browse the repository at this point in the history
fix: update v1 branch name across workflow files
  • Loading branch information
devadula-nandan authored May 30, 2024
2 parents ac47525 + 927cc01 commit 2d16591
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI # Run CI Checks
on:
pull_request:
branches:
- main_v1
- v1

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: CodeQL # Run code security scans

on:
pull_request:
branches: [main_v1]
branches: [v1]

push:
branches: [main_v1]
branches: [v1]

schedule:
- cron: '0 0 * * 0'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- synchronize

jobs:
main_v1:
v1:
name: validate title
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
fetch-depth: 0 # https://github.com/actions/checkout/issues/217
token: ${{ secrets.GH_TOKEN_LERNA }} # https://github.com/lerna/lerna/issues/1957
ref: 'main_v1'
ref: 'v1'

# https://github.com/actions/checkout#push-a-commit-using-the-built-in-token
- run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sync-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Sync commits across versions

on:
pull_request:
branches: [sync-commit] # TODO: Rename to branch `main_v1` after token issue resolved.
branches: [sync-commit] # TODO: Rename to branch `v1` after token issue resolved.
types: [closed]

jobs:
sync-commit:
if: github.event.pull_request.merged == true # Merged PRs to `main_v1`.
if: github.event.pull_request.merged == true # Merged PRs to `v1`.
runs-on: ubuntu-latest

steps:
Expand All @@ -19,7 +19,7 @@ jobs:
# https://git-scm.com/docs/git-cherry-pick#_options
- name: Cherry pick

# TODO: Rename to branch `main_v1` after token issue resolved.
# TODO: Rename to branch `v1` after token issue resolved.
run: |
git config user.name github-actions
git config user.email [email protected]
Expand Down
2 changes: 1 addition & 1 deletion config/storybook-addon-carbon-theme/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Storybook addon for Carbon themes

This package is now only being published from our `main` branch and is no longer
being maintained from `main_v1`. TO view the package documentation, see
being maintained from `v1`. TO view the package documentation, see
[here](https://github.com/carbon-design-system/ibm-products/blob/main/config/storybook-addon-carbon-theme/README.md).
2 changes: 1 addition & 1 deletion packages/ibm-products/src/global/js/utils/story-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const prepareStory = (template, options) => {
*/
export const CodesandboxLink = ({ exampleDirectory }) => (
<a
href={`https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/main_v1/examples/carbon-for-ibm-products/${exampleDirectory}`}
href={`https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/v1/examples/carbon-for-ibm-products/${exampleDirectory}`}
>
<img
alt="Edit on CodeSandbox"
Expand Down
2 changes: 1 addition & 1 deletion scripts/example-gallery-builder/gallery-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const getExampleDirectoriesConfig = (
// config url or default
const url =
config?.url ??
`https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/main_v1/examples/carbon-for-ibm-products/${dir}`;
`https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/v1/examples/carbon-for-ibm-products/${dir}`;

const output = { label, url };

Expand Down
4 changes: 2 additions & 2 deletions scripts/example-gallery-builder/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
* By default the following mapping is made
* {
* label: folder name,
* url: baseUrl + folder name, // baseUrl is `https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/main_v1/examples/carbon-for-ibm-products/`
* url: baseUrl + folder name, // baseUrl is `https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/v1/examples/carbon-for-ibm-products/`
* thumbnail: folder name + '/thumbnail.png'
* }
*
* NOTE: If no thumbnail is found then the thumbnail value is omitted from the output.
* NOTE2: A local config file allows examples not in this repo to be added
*
* The resulting Carbon for IBM Products example gallery can be seen here
* https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/main_v1/examples/carbon-for-ibm-products/example-gallery
* https://codesandbox.io/s/github/carbon-design-system/ibm-products/tree/v1/examples/carbon-for-ibm-products/example-gallery
*/

const path = require('path');
Expand Down

0 comments on commit 2d16591

Please sign in to comment.