Update upstream

.github/workflows/ci.yml

@@ -6,6 +6,10 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,11 +19,11 @@ jobs:
         node: [12, 14, 16]
 
     steps:
-      - name: Checkout repo
-        uses: actions/checkout@v2.3.4
+      - name: Check out repo
+        uses: actions/checkout@v3.0.2
 
       - name: Install node
-        uses: actions/setup-node@v2.4.0
+        uses: actions/setup-node@v3.1.1
         with:
           node-version: ${{ matrix.node }}
 

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,44 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  schedule:
+    - cron: '25 15 * * 3'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  analyze:
+    name: Analyze
+
+    runs-on: ubuntu-latest
+
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+
+    steps:
+    - name: Check out repository
+      uses: actions/[email protected]
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2

.github/workflows/fixup-commits.yml

@@ -0,0 +1,18 @@
+name: Block on merge commits
+
+on: pull_request
+
+permissions:
+  pull-requests: read
+
+jobs:
+  message:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out Repo
+        uses: actions/[email protected]
+
+      - uses: ./
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,10 +1,8 @@
 # Changelog
-
-## Unreleased
-
 ## Version 1.0.0
 
-- Removed last message mentions from block-autosquash-commits-action.
-## Version 1.0.0
+- Initial release, forked from https://github.com/xt0rted/block-autosquash-commits-action (Thank You!)\
+
+## Version 2.0.0
 
-- Initial release, forked from https://github.com/xt0rted/block-autosquash-commits-action (Thank You!)
+- Moved to actions v2 which uses the new yaml syntax for workflows.

README.md

@@ -1,6 +1,7 @@
 # Block Merge Commits Action
 
 [![CI](https://github.com/Morishiri/block-merge-commits-action/workflows/CI/badge.svg)](https://github.com/Morishiri/block-merge-commits-action/actions?query=workflow%3ACI)
+[![CodeQL](https://github.com/Morishiri/block-merge-commits-action/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/Morishiri/block-merge-commits-action/actions/workflows/codeql-analysis.yml)
 
 A Github Action to prevent merging pull requests containing merge commits.