Skip to content

Commit

Permalink
fix: renaming branch master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
jeripeierSBB committed Jan 16, 2024
1 parent 03a178e commit 16c04b1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: 'CodeQL'

on:
push:
branches: [master]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [master]
branches: [main]
schedule:
- cron: '43 16 * * 2'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_run:
workflows: ['Continuous Integration']
types: [completed]
branches: [master]
branches: [main]

permissions: read-all

Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: 'Release: Create release with standard-version'
run: yarn standard-version
- name: 'Release: Push release to repository'
run: git push --follow-tags origin master
run: git push --follow-tags origin main
- name: 'Release: Determine npm tag'
id: npm_tag
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.com/lyne-design-system/lyne-design-tokens.svg?branch=master)](https://travis-ci.com/lyne-design-system/lyne-design-tokens) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) ![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/lyne-design-system/lyne-design-tokens?label=release)
[![Build Status](https://travis-ci.com/lyne-design-system/lyne-design-tokens.svg?branch=main)](https://travis-ci.com/lyne-design-system/lyne-design-tokens) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) ![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/lyne-design-system/lyne-design-tokens?label=release)

# Lyne Design Tokens

Expand Down Expand Up @@ -44,6 +44,6 @@ Please follow the [Conventional Commits](https://www.conventionalcommits.org/en/

## Deployment

TravisCI is building as soon as a branch gets merged into the master branch. After successful linting, the Lyne Design Tokens package will be published to npm. You can find the package on npm [here](https://www.npmjs.com/package/lyne-design-tokens).
TravisCI is building as soon as a branch gets merged into the main branch. After successful linting, the Lyne Design Tokens package will be published to npm. You can find the package on npm [here](https://www.npmjs.com/package/lyne-design-tokens).

After successful build, the job for lyne-components will be triggered.
4 changes: 2 additions & 2 deletions ci/createCdnAssets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ const config = {
const tokensFileSource = `${config.tokensSourcePath}${config.tokensFileName}`;
const tokensFileTarget = `${cdnDir}/${config.tokensFileName}`;

await git.checkout('master');
await git.checkout('main');
await git.pull();

// make sure cdn folder exists
Expand Down Expand Up @@ -61,7 +61,7 @@ const config = {
// add all files, commit and push
await git.add(`${cdnDir}/*`);
await git.commit(`chore: add CDN assets for version ${version} [skip ci]`);
await git.push('origin', 'master', {
await git.push('origin', 'main', {
'--force': 'true',
});

Expand Down

0 comments on commit 16c04b1

Please sign in to comment.