Skip to content

Commit 9a87f52

Browse files
authored
Add investo project (#11)
* Add Investo Manifesto Project. * Update CI Pipeline to use package.json
1 parent 38648f5 commit 9a87f52

File tree

6 files changed

+19
-14
lines changed

6 files changed

+19
-14
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,20 @@ jobs:
1717
- name: Checkout code
1818
uses: actions/checkout@v4
1919

20+
- name: Install jq
21+
run: sudo apt-get install -y jq
22+
2023
- name: Verify Portfolio Version
2124
run: |
22-
current_version=$(cat ./portfolio/VERSION | tr -d '\n\r')
25+
current_version=$(jq -r '.version' ./portfolio/package.json)
2326
previous_version=$(docker image ls --filter "reference=***/web-portfolio" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
24-
if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
27+
if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
2528
2629
- name: Verify Mail Server Version
2730
run: |
28-
current_version=$(cat ./mail-server/VERSION | tr -d '\n\r')
31+
current_version=$(jq -r '.version' ./mail-server/package.json)
2932
previous_version=$(docker image ls --filter "reference=***/mail-server" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
30-
if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
33+
if [[ $current_version = $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
3134
3235
validate-docker-compose:
3336
name: Validate Docker Compose Files
@@ -80,6 +83,9 @@ jobs:
8083
- name: Checkout code
8184
uses: actions/checkout@v4
8285

86+
- name: Install jq
87+
run: sudo apt-get install -y jq
88+
8389
- name: Set up Docker Buildx
8490
uses: docker/setup-buildx-action@v3
8591

@@ -91,17 +97,17 @@ jobs:
9197

9298
- name: Build Docker Image
9399
run: |
94-
portfolio_version=$(cat ./portfolio/VERSION | tr -d '\n\r')
100+
portfolio_version=$(jq -r '.version' ./portfolio/package.json)
95101
previous_version=$(docker image ls --filter "reference=${{ secrets.DOCKER_USERNAME }}/web-portfolio" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
96-
if [[ $portfolio_version -eq $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
102+
if [[ $portfolio_version -eq $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
97103
98104
docker build -f ./portfolio/Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/web-portfolio:$portfolio_version -t ${{ secrets.DOCKER_USERNAME }}/web-portfolio:latest ./portfolio
99105
docker save --output portfolio-versioned.docker ${{ secrets.DOCKER_USERNAME }}/web-portfolio:$portfolio_version
100106
docker save --output portfolio-latest.docker ${{ secrets.DOCKER_USERNAME }}/web-portfolio:latest
101107
102-
mail_server_version=$(cat ./mail-server/VERSION)
108+
mail_server_version=$(jq -r '.version' ./mail-server/package.json)
103109
previous_version=$(docker image ls --filter "reference=${{ secrets.DOCKER_USERNAME }}/web-portfolio" --format "{{.Repository}}:{{.Tag}}" | awk -F ':' '{print $2}')
104-
if [[ $mail_server_version -eq $previous_version ]]; then echo 'Update semantic version in VERSION file'; exit 1; fi
110+
if [[ $mail_server_version -eq $previous_version ]]; then echo 'Update semantic version in the package.json file'; exit 1; fi
105111
106112
docker build -f ./mail-server/Dockerfile -t ${{ secrets.DOCKER_USERNAME }}/mail-server:$mail_server_version -t ${{ secrets.DOCKER_USERNAME }}/mail-server:latest ./mail-server
107113
docker save --output mail-server-versioned.docker ${{ secrets.DOCKER_USERNAME }}/mail-server:$mail_server_version
@@ -151,11 +157,11 @@ jobs:
151157
docker load --input ./mail-server-versioned.docker
152158
docker load --input ./mail-server-latest.docker
153159
154-
portfolio_version=$(cat ./portfolio/VERSION | tr -d '\n\r')
160+
mail_server_version=$(jq -r '.version' ./portfolio/package.json)
155161
docker push ${{ secrets.DOCKER_USERNAME }}/web-portfolio:$portfolio_version
156162
docker push ${{ secrets.DOCKER_USERNAME }}/web-portfolio:latest
157163
158-
mail_server_version=$(cat ./mail-server/VERSION | tr -d '\n\r')
164+
mail_server_version=$(jq -r '.version' ./mail-server/package.json)
159165
docker push ${{ secrets.DOCKER_USERNAME }}/mail-server:$mail_server_version
160166
docker push ${{ secrets.DOCKER_USERNAME }}/mail-server:latest
161167

mail-server/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Change Log
22

3-
## 1.1.0
3+
## 1.0.4
44
* Rename secret and config variables.
55

66
# 1.0.3

mail-server/VERSION

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

portfolio/VERSION

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

portfolio/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "web-portfolio-v2",
33
"private": true,
4-
"version": "2.0.2",
4+
"version": "2.1.1",
55
"type": "module",
66
"scripts": {
77
"dev": "vite --mode development",

portfolio/src/sections/Projects/Projects.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ function Projects() {
1818
/>
1919
<ProjectCard
2020
src={investo}
21+
link="https://github.com/jonepl/Investo-Manifesto"
2122
h3="Investo Manifesto"
2223
p="Finacial Investment Visualizer"
2324
/>

0 commit comments

Comments
 (0)