martyn
/
townsquare
mirror of https://github.com/bra1n/townsquare.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prepare develop branch

This commit is contained in:
Steffen 2021-05-09 21:43:51 +02:00
parent fb87f6f8cb
commit 8d4bf876a7
No known key found for this signature in database
GPG Key ID: 764D74E98267DFC6
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/changelog-check.yml vendored
View File

@ -4,6 +4,7 @@ on:
types: [assigned, opened, synchronize, reopened, labeled, unlabeled] types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
branches: branches:
- main - main
- develop
jobs: jobs:
build: build:
name: Check Actions name: Check Actions

4
.github/workflows/codeql-analysis.yml vendored
View File

@ -13,10 +13,10 @@ name: "CodeQL"
on: on:
push: push:
branches: [ main ] branches: [ main, develop ]
pull_request: pull_request:
# The branches below must be a subset of the branches above # The branches below must be a subset of the branches above
branches: [ main ] branches: [ main, develop ]
schedule: schedule:
- cron: '27 22 * * 1' - cron: '27 22 * * 1'

6
CONTRIBUTING.md
View File

@ -19,6 +19,9 @@ Before submitting your contribution, please make sure to take a moment and read
- The `main` branch is what is currently deployed to the website. All development should be done in dedicated branches. - The `main` branch is what is currently deployed to the website. All development should be done in dedicated branches.
- The `develop` branch contains the changes that will be deployed to main next. In order to prepare a release, development
branches should have their Pull Request against `develop` and only releases should be merged from `develop` into `main`.
- Work in the `src` folder and **DO NOT** checkin `dist` in the commits. - Work in the `src` folder and **DO NOT** checkin `dist` in the commits.
- It's OK to have multiple small commits as you work on the PR - GitHub will automatically squash it before merging. - It's OK to have multiple small commits as you work on the PR - GitHub will automatically squash it before merging.
@ -31,6 +34,9 @@ Before submitting your contribution, please make sure to take a moment and read
- If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`. - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `update entities encoding/decoding (fix #3899)`.
- Provide a detailed description of the bug in the PR. Live demo preferred. - Provide a detailed description of the bug in the PR. Live demo preferred.
- You'll need to update the `CHANGELOG.md` with a description of your changes before you open a pull request and your code
should pass the lint check.
## Development Setup ## Development Setup
You will need [Node.js](http://nodejs.org) **version 8+** and a Chrome browser. You will need [Node.js](http://nodejs.org) **version 8+** and a Chrome browser.