diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-CI.yml similarity index 77% rename from .github/workflows/backend-tests.yml rename to .github/workflows/backend-CI.yml index c07833b5..99ad01cb 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-CI.yml @@ -1,4 +1,4 @@ -name: Backend - Tests +name: Backend - CI on: pull_request: @@ -7,12 +7,6 @@ on: - main paths: - "backend/**" - push: - branches: - - sprint-release - - main - paths: - - "backend/**" jobs: linting: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c946ab5a..7187101d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/deploy_prod_env.yml b/.github/workflows/deploy_production.yml similarity index 83% rename from .github/workflows/deploy_prod_env.yml rename to .github/workflows/deploy_production.yml index f0bd70ce..1972cf8b 100644 --- a/.github/workflows/deploy_prod_env.yml +++ b/.github/workflows/deploy_production.yml @@ -1,4 +1,4 @@ -name: Deploy Production Service +name: Deploy - Production Env. on: push: @@ -6,8 +6,8 @@ on: - main jobs: - publish: - name: Publish Docker Image + PublishImages: + name: Publish Docker Images runs-on: ubuntu-latest steps: @@ -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: diff --git a/.github/workflows/deploy_test_env.yml b/.github/workflows/deploy_test.yml similarity index 88% rename from .github/workflows/deploy_test_env.yml rename to .github/workflows/deploy_test.yml index db397385..b6238b16 100644 --- a/.github/workflows/deploy_test_env.yml +++ b/.github/workflows/deploy_test.yml @@ -1,4 +1,4 @@ -name: Deploy Test Service +name: Deploy - Test Env. on: push: @@ -6,7 +6,7 @@ on: - sprint-release jobs: - publish: + PublishImages: name: Publish Docker Image runs-on: ubuntu-latest @@ -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: diff --git a/.github/workflows/frontend-CI.yml b/.github/workflows/frontend-CI.yml new file mode 100644 index 00000000..7b247076 --- /dev/null +++ b/.github/workflows/frontend-CI.yml @@ -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 diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml deleted file mode 100644 index 47792462..00000000 --- a/.github/workflows/frontend-tests.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Frontend - Tests - -on: - pull_request: - branches: - - sprint-release - - main - paths: - - "frontend/**" - push: - branches: - - sprint-release - - main - paths: - - "frontend/**" - -jobs: - linting: - name: Check linting - runs-on: ubuntu-latest - - steps: - - name: Echo Linting - run: echo "linting" - - tests: - needs: linting - name: Run Tests - runs-on: ubuntu-latest - - steps: - - name: Echo Test - run: echo "test" diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 9a193b50..2ec7b770 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -1,7 +1,7 @@ import "./App.css"; function App() { - return

Building Information Enhancer v.2

; + return

Building Information Enhancer v.3

; } export default App;