Merge pull request #30 from HardNorth/develop

Release

.github/workflows/ci.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
     - '*'
-    - '!master'
+    - '!main'
     paths-ignore:
     - README.md
     - CHANGELOG.md

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-    - master
+    - main
     paths-ignore:
     - README.md
     - CHANGELOG.md
@@ -39,7 +39,7 @@ jobs:
         node-version: 12.x
 
     - name: Generate versions
-      uses: HardNorth/github-version-generate@v1.1.0
+      uses: HardNorth/github-version-generate@v1.1.1
       with:
         version-source: file
         version-file: ${{ env.VERSION_FILE }}
@@ -113,19 +113,19 @@ jobs:
         prerelease: false
 
     - name: Checkout develop branch
-      if: ${{github.ref}} == 'master'
+      if: ${{github.ref}} == 'main'
       uses: actions/checkout@v2
       with:
         ref: 'develop'
         fetch-depth: 0
 
     - name: Merge release branch into develop
       id: mergeIntoDevelop
-      if: ${{github.ref}} == 'master'
+      if: ${{github.ref}} == 'main'
       run: |
-        git merge -m 'Merge master branch into develop after a release' origin/master
+        git merge -m 'Merge main branch into develop after a release' origin/main
         git status | (! grep -Fq 'both modified:') || git status | grep -F 'both modified:' \
-        | { echo -e 'Unable to merge master into develop, merge conflicts:'; (! grep -Eo '[^ ]+$') }
+        | { echo -e 'Unable to merge main into develop, merge conflicts:'; (! grep -Eo '[^ ]+$') }
 
     - name: Update version file
       id: versionFileUpdate

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased]
+### Changed
+- Some security fixes, by @dependabot
 
 ## [1.1.1]
 ### Changed

README.md

@@ -1,4 +1,4 @@
-# Version generation for GitHub Actions 
+# Version generation and bump for GitHub Actions 
 [![CI Build](https://github.com/HardNorth/github-version-generate/actions/workflows/ci.yml/badge.svg)](https://github.com/HardNorth/github-version-generate/actions/workflows/ci.yml)
 [![License](https://img.shields.io/badge/License-Apache%202.0-brightgreen.svg)](https://opensource.org/licenses/Apache-2.0)
 

package.json

@@ -29,7 +29,7 @@
     "@actions/exec": "1.0.4",
     "@actions/github": "4.0.0",
     "escape-html": "1.0.3",
-    "moment": "2.29.1",
+    "moment": "2.29.2",
     "xregexp": "4.4.0"
   },
   "bugs": {