Skip to content

Commit 8856918

Browse files
committed
merge: resolve conflicts by taking infra-swagger-fix; drop .split-tmp; ignore it
2 parents 7be6094 + 6816891 commit 8856918

29 files changed

Lines changed: 668 additions & 1450 deletions

.github/workflows/deploy.yml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
name: Rust app
2-
3-
on:
4-
push:
5-
branches: ["main"]
6-
pull_request:
7-
branches: ["main"]
8-
9-
jobs:
10-
build-and-deploy:
11-
runs-on: ubuntu-latest
12-
permissions:
13-
packages: write
14-
15-
steps:
16-
- uses: actions/checkout@v4
17-
18-
- name: Check for unverified commits
19-
uses: nadock/verified_commits_check@v1
20-
21-
- name: Build
22-
run: cargo build --verbose
23-
working-directory: apps/backend/task-api
24-
25-
- name: Run tests
26-
run: cargo test --verbose
27-
working-directory: apps/backend/task-api
28-
29-
- name: log into GitHub container registry
30-
uses: docker/login-action@v2
31-
with:
32-
registry: ghcr.io
33-
username: ${{ github.actor }}
34-
password: ${{ secrets.GITHUB_TOKEN }}
35-
36-
- name: downcase REPO
37-
run: echo "Not needed, using fixed repo name."
38-
39-
- name: Build and Push Docker Image
40-
uses: docker/build-push-action@v4
41-
with:
42-
context: apps/backend/task-api
43-
file: apps/backend/task-api/Dockerfile
44-
push: true
45-
tags: |
46-
ghcr.io/micheal-ndoh/task-api:latest
1+
# name: Rust app
2+
3+
# on:
4+
# push:
5+
# branches: ["main"]
6+
# pull_request:
7+
# branches: ["main"]
8+
9+
# jobs:
10+
# build-and-deploy:
11+
# runs-on: ubuntu-latest
12+
# permissions:
13+
# packages: write
14+
15+
# steps:
16+
# - uses: actions/checkout@v4
17+
18+
# - name: Check for unverified commits
19+
# uses: nadock/verified_commits_check@v1
20+
21+
# - name: Build
22+
# run: cargo build --verbose
23+
# working-directory: apps/backend/task-api
24+
25+
# - name: Run tests
26+
# run: cargo test --verbose
27+
# working-directory: apps/backend/task-api
28+
29+
# - name: log into GitHub container registry
30+
# uses: docker/login-action@v2
31+
# with:
32+
# registry: ghcr.io
33+
# username: ${{ github.actor }}
34+
# password: ${{ secrets.GITHUB_TOKEN }}
35+
36+
# - name: downcase REPO
37+
# run: echo "Not needed, using fixed repo name."
38+
39+
# - name: Build and Push Docker Image
40+
# uses: docker/build-push-action@v4
41+
# with:
42+
# context: apps/backend/task-api
43+
# file: apps/backend/task-api/Dockerfile
44+
# push: true
45+
# tags: |
46+
# ghcr.io/micheal-ndoh/task-api:latest

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
target/
33
**/*.rs.bk
44
Cargo.lock
5-
!apps/backend/task-api/vendor/**/Cargo.lock
65
*.pdb
76
docs/PROJECT_STATUS.md
87
ASSIGNMENT_ANALYSIS.md
@@ -76,3 +75,5 @@ grafana_data/
7675
*.backup
7776
*.old
7877
*.orig
78+
79+
.split-tmp/

.split-tmp/app

Lines changed: 0 additions & 1 deletion
This file was deleted.

.split-tmp/infra

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)