From 16c04b1516232edd4494f582b06a4f3fdc1a0d1d Mon Sep 17 00:00:00 2001 From: Jeremias Peier Date: Tue, 16 Jan 2024 13:54:13 +0100 Subject: [PATCH] fix: renaming branch master to main --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- README.md | 4 ++-- ci/createCdnAssets.ts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 079aa295..4df199f6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -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' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dd8f6e47..7f5bce18 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: workflow_run: workflows: ['Continuous Integration'] types: [completed] - branches: [master] + branches: [main] permissions: read-all @@ -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: | diff --git a/README.md b/README.md index 128d867c..fdd8b5eb 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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. diff --git a/ci/createCdnAssets.ts b/ci/createCdnAssets.ts index 53449c91..7d7e07bf 100644 --- a/ci/createCdnAssets.ts +++ b/ci/createCdnAssets.ts @@ -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 @@ -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', });