mirror of
https://github.com/theoludwig/theoludwig.git
synced 2024-09-09 09:45:52 +02:00
chore: usage of GitHub flow instead of Git flow
This commit is contained in:
parent
8027e2deed
commit
3e18536c2e
4
.github/workflows/Divlo.yml
vendored
4
.github/workflows/Divlo.yml
vendored
@ -2,9 +2,9 @@ name: 'Divlo'
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master, development]
|
||||
branches: [master]
|
||||
pull_request:
|
||||
branches: [development]
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
ci:
|
||||
|
4
.github/workflows/codeql-analysis.yml
vendored
4
.github/workflows/codeql-analysis.yml
vendored
@ -2,9 +2,9 @@ name: 'CodeQL'
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [master, development]
|
||||
branches: [master]
|
||||
pull_request:
|
||||
branches: [development]
|
||||
branches: [master]
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
|
@ -2,12 +2,12 @@ image: 'gitpod/workspace-full'
|
||||
|
||||
tasks:
|
||||
- name: 'docker-daemon'
|
||||
before: 'cp .env.example .env && npm install --global npm@7 && npm install'
|
||||
init: 'sudo docker-up'
|
||||
init: 'cp .env.example .env && npm install --global npm@7 && npm ci'
|
||||
command: 'sudo docker-up'
|
||||
- name: 'docker-container'
|
||||
before: 'echo "Waiting for docker daemon to start" &&
|
||||
init: 'echo "Waiting for docker daemon to start" &&
|
||||
until docker info &> /dev/null; do sleep 1; done;'
|
||||
init: 'docker-compose up'
|
||||
command: 'docker-compose up'
|
||||
|
||||
ports:
|
||||
- port: 3000
|
||||
|
@ -1,5 +1,4 @@
|
||||
{
|
||||
"branches": ["master", "development"],
|
||||
"plugins": [
|
||||
[
|
||||
"@semantic-release/commit-analyzer",
|
||||
|
17027
package-lock.json
generated
17027
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -56,7 +56,7 @@
|
||||
"react-component-form": "1.3.0",
|
||||
"react-dom": "17.0.2",
|
||||
"universal-cookie": "4.0.4",
|
||||
"validator": "13.5.2"
|
||||
"validator": "13.6.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "12.1.1",
|
||||
|
@ -1,11 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
echo "VERCEL_ENV: ${VERCEL_ENV}"
|
||||
|
||||
if [[ "${VERCEL_ENV}" == "production" ]]; then
|
||||
echo "✅ - Build can proceed"
|
||||
exit 1
|
||||
else
|
||||
echo "🛑 - Build cancelled"
|
||||
exit 0
|
||||
fi
|
Loading…
Reference in New Issue
Block a user