Skip to content

Commit

Permalink
Merge branch 'master' into sso-presenter
Browse files Browse the repository at this point in the history
  • Loading branch information
ulfgebhardt authored Mar 12, 2024
2 parents e2667d6 + 484db1d commit ac5784c
Show file tree
Hide file tree
Showing 42 changed files with 3,720 additions and 5,526 deletions.
7 changes: 7 additions & 0 deletions .github/file-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ presenter-test-unit-code: &presenter-test-unit-code
presenter-test-build-code: &presenter-test-build-code
- 'presenter/**/*'

presenter-test-build-docker: &presenter-test-build-docker
- 'presenter/**/*'


presenter-test-build-docs: &presenter-test-build-docs
- 'presenter/**/*.md'
- 'presenter/.vuepress/*'
Expand All @@ -30,6 +34,9 @@ backend-test-unit-code: &backend-test-unit-code
backend-test-build-code: &backend-test-build-code
- 'backend/**/*'

backend-test-build-docker: &backend-test-build-docker
- 'backend/**/*'

backend-test-build-docs: &backend-test-build-docs
- 'backend/**/*.md'
- 'backend/.vuepress/*'
7 changes: 6 additions & 1 deletion .github/workflows/backend.test.build.code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for backend file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -29,6 +29,11 @@ jobs:
env:
WORKING_DIRECTORY: ./backend
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/backend.test.build.docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: "backend:test:build test docker"

on: push

jobs:
# only (but most important) job from this workflow required for pull requests
# check results serve as run conditions for all other jobs here
files-changed:
name: Detect File Changes - backend-test-build-docker
runs-on: ubuntu-latest
outputs:
changes: ${{ steps.changes.outputs.backend-test-build-docker }}
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Check for backend file changes
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
filters: .github/file-filters.yml
list-files: shell

build-production:
if: needs.files-changed.outputs.changes == 'true'
name: Build Docker Production - Backend
needs: files-changed
runs-on: ubuntu-latest
env:
WORKING_DIRECTORY: ./backend
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Backend | Build Docker Production
run: docker compose -f docker-compose.yml build
working-directory: ${{env.WORKING_DIRECTORY}}

build-development:
if: needs.files-changed.outputs.changes == 'true'
name: Build Docker Development - Backend
needs: files-changed
runs-on: ubuntu-latest
env:
WORKING_DIRECTORY: ./backend
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Backend | Build Docker Development
run: docker compose build
working-directory: ${{env.WORKING_DIRECTORY}}
7 changes: 6 additions & 1 deletion .github/workflows/backend.test.build.docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for backend file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -29,6 +29,11 @@ jobs:
env:
WORKING_DIRECTORY: ./backend
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/backend.test.lint.code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for backend file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -29,6 +29,11 @@ jobs:
env:
WORKING_DIRECTORY: ./backend
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/backend.test.unit.code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for backend file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -32,11 +32,16 @@ jobs:
env:
WORKING_DIRECTORY: ./backend
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

- name: Backend | docker-compose database
run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
run: docker-compose -f docker-compose.yml up --detach --no-deps database

- name: Backend | Unit
run: npm install && npm run db:migrate && npm run test:unit
Expand Down
27 changes: 16 additions & 11 deletions .github/workflows/deploy.docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,20 @@ jobs:
build-and-deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@master
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: vuepress-deploy
uses: jenkey2011/vuepress-deploy@master
env:
ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#TARGET_REPO: username/repo
#TARGET_BRANCH: master
BUILD_SCRIPT: npm install && npm run docs:build
BUILD_DIR: build/docs/
VUEPRESS_BASE: "dreammall.earth"
- name: Checkout
uses: actions/checkout@master

- name: vuepress-deploy
uses: jenkey2011/vuepress-deploy@master
env:
ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
#TARGET_REPO: username/repo
#TARGET_BRANCH: master
BUILD_SCRIPT: npm install && npm run docs:build
BUILD_DIR: build/docs/
VUEPRESS_BASE: "dreammall.earth"
5 changes: 5 additions & 0 deletions .github/workflows/presenter.deploy.chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ jobs:
CHROMATIC_PROJECT_TOKEN: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
WORKING_DIRECTORY: ./presenter
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4
with:
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/presenter.test.build.code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,16 @@ jobs:
outputs:
changes: ${{ steps.changes.outputs.presenter-test-build-code }}
steps:
- uses: actions/checkout@v4
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

- name: Check for presenter file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/presenter.test.build.docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: "presenter:test:build test docker"

on: push

jobs:
# only (but most important) job from this workflow required for pull requests
# check results serve as run conditions for all other jobs here
files-changed:
name: Detect File Changes - presenter-test-build-docker
runs-on: ubuntu-latest
outputs:
changes: ${{ steps.changes.outputs.presenter-test-build-docker }}
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Check for presenter file changes
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
filters: .github/file-filters.yml
list-files: shell

build-production:
if: needs.files-changed.outputs.changes == 'true'
name: Build Docker Production - Presenter
needs: files-changed
runs-on: ubuntu-latest
env:
WORKING_DIRECTORY: ./presenter
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Presenter | Build Docker Production
run: docker compose -f docker-compose.yml build
working-directory: ${{env.WORKING_DIRECTORY}}

build-development:
if: needs.files-changed.outputs.changes == 'true'
name: Build Docker Development - Presenter
needs: files-changed
runs-on: ubuntu-latest
env:
WORKING_DIRECTORY: ./presenter
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Presenter | Build Docker Development
run: docker compose build
working-directory: ${{env.WORKING_DIRECTORY}}
7 changes: 6 additions & 1 deletion .github/workflows/presenter.test.build.docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for presenter file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -29,6 +29,11 @@ jobs:
env:
WORKING_DIRECTORY: ./presenter
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/presenter.test.build.storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for presenter file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -29,6 +29,11 @@ jobs:
env:
WORKING_DIRECTORY: ./presenter
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/presenter.test.lint.code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for presenter file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -29,6 +29,11 @@ jobs:
env:
WORKING_DIRECTORY: ./presenter
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/presenter.test.unit.code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for presenter file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand All @@ -29,6 +29,11 @@ jobs:
env:
WORKING_DIRECTORY: ./presenter
steps:
- name: Set Node version
uses: actions/setup-node@v4
with:
node-version: '>=21'

- name: Checkout code
uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v4

- name: Check for Code file changes
uses: dorny/paths-filter@v3.0.1
uses: dorny/paths-filter@v3.0.2
id: changes
with:
token: ${{ github.token }}
Expand Down
Loading

0 comments on commit ac5784c

Please sign in to comment.