Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed double actions #48

Merged
merged 2 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Backend - Tests
name: Backend - CI

on:
pull_request:
Expand All @@ -7,12 +7,6 @@ on:
- main
paths:
- "backend/**"
push:
branches:
- sprint-release
- main
paths:
- "backend/**"

jobs:
linting:
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,13 @@ on:
paths:
- "backend/**"
- "frontend/**"
push:
branches:
- sprint-release
- main
paths:
- "backend/**"
- "frontend/**"

jobs:
build:
name: Build the Docker Image
name: Build Images
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Build Image
- name: Build Images
run: docker compose build --pull
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Deploy Production Service
name: Deploy - Production Env.

on:
push:
branches:
- main

jobs:
publish:
name: Publish Docker Image
PublishImages:
name: Publish Docker Images
runs-on: ubuntu-latest

steps:
Expand All @@ -22,9 +22,9 @@ jobs:
- name: Logout
run: docker logout

deploy:
needs: publish
name: Deploy Image on the Server
DeployProductionEnv:
needs: PublishImages
name: Deploy Image in the Production Environment
runs-on: ubuntu-latest

steps:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: Deploy Test Service
name: Deploy - Test Env.

on:
push:
branches:
- sprint-release

jobs:
publish:
PublishImages:
name: Publish Docker Image
runs-on: ubuntu-latest

Expand All @@ -22,9 +22,9 @@ jobs:
- name: Logout
run: docker logout

deploy:
needs: publish
name: Deploy Image on the Server
DeployTestEnv:
needs: PublishImages
name: Deploy Image in the Test Environment
runs-on: ubuntu-latest

steps:
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/frontend-CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Frontend - CI

on:
pull_request:
branches:
- sprint-release
- main
paths:
- "frontend/**"

jobs:
RunChecks:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Cache dependencies
uses: actions/cache@v3
with:
path: ~/.npm
key: npm-${{ hashFiles('package-lock.json') }}
restore-keys: npm-

- name: Setup frontend
run: npm ci
working-directory: frontend

- name: Run linting checks
run: npm run lint
working-directory: frontend
33 changes: 0 additions & 33 deletions .github/workflows/frontend-tests.yml

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "./App.css";

function App() {
return <h1> Building Information Enhancer v.2</h1>;
return <h1> Building Information Enhancer v.3</h1>;
}

export default App;
Loading