diff --git a/.github/workflows/CI-pipeline.yml b/.github/workflows/CI-pipeline.yml index c5e06c8..1d16d38 100644 --- a/.github/workflows/CI-pipeline.yml +++ b/.github/workflows/CI-pipeline.yml @@ -17,7 +17,7 @@ on: push: branches: - develop - - '!master' + - '!main' paths-ignore: - README.md - CHANGELOG.md diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2c54f7b..a6ab6b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ name: release on: push: branches: - - master + - main paths-ignore: - '.github/**' - README.md @@ -98,7 +98,7 @@ jobs: run: | git tag -a v${{ needs.calculate-version.outputs.releaseVersion }} -m ${{ needs.calculate-version.outputs.releaseVersion }} npm version from-git - git push origin master + git push origin main - name: Update version in changelog file run: | releaseDate=$(date +'%Y-%m-%d') @@ -108,7 +108,7 @@ jobs: git status git add ${{ env.changelogFileName }} git commit -m "Mention ${{ needs.calculate-version.outputs.releaseVersion }} version in changelog file" - git push origin master + git push origin main - name: Read changelog Entry id: readChangelogEntry uses: mindsers/changelog-reader-action@v1.1.0 @@ -125,7 +125,7 @@ jobs: run: | git fetch git checkout develop - git merge master -Xtheirs --allow-unrelated-histories + git merge main -Xtheirs --allow-unrelated-histories echo "${{ steps.bumpSnapshotVersion.outputs.next-version }}-SNAPSHOT" > ${{ env.versionFileName }} echo "patch" > ${{ env.versionFragmentFileName }} git status