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

Profile works #26

Merged
merged 32 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
90d74e0
Merge pull request #10 from MyriadFlow/main
Joshua-Ogbonna Nov 8, 2024
1353c50
Merge pull request #11 from MyriadFlow/profile-fixes
Joshua-Ogbonna Nov 8, 2024
4a39559
Merge pull request #12 from MyriadFlow/main
Joshua-Ogbonna Nov 8, 2024
aedc913
Update page.js
Joshua-Ogbonna Nov 8, 2024
157a7ee
chore: expose save changes button
Joshua-Ogbonna Nov 8, 2024
42c4e3d
Merge pull request #14 from MyriadFlow/profile-fixes
Joshua-Ogbonna Nov 8, 2024
e2b0dbc
Merge pull request #13 from MyriadFlow/main
Joshua-Ogbonna Nov 8, 2024
7394660
chore: add edit brand button
Joshua-Ogbonna Nov 9, 2024
fd5bde5
Merge pull request #16 from MyriadFlow/brand-fixes
Joshua-Ogbonna Nov 9, 2024
9a75087
Merge pull request #17 from MyriadFlow/main
Joshua-Ogbonna Nov 9, 2024
f28b823
chore: more work on brand page
Joshua-Ogbonna Nov 11, 2024
34a4dea
Merge pull request #18 from MyriadFlow/brand-page-works
Joshua-Ogbonna Nov 11, 2024
c854f0d
Merge pull request #19 from MyriadFlow/main
Joshua-Ogbonna Nov 11, 2024
4437f58
chore: remove image from copied link
Joshua-Ogbonna Nov 11, 2024
12e686b
Merge pull request #20 from MyriadFlow/brand-page-works
Joshua-Ogbonna Nov 11, 2024
bc9801e
Merge pull request #21 from MyriadFlow/main
Joshua-Ogbonna Nov 11, 2024
12655c4
chore: fix profile update works
Joshua-Ogbonna Nov 12, 2024
5eaa21d
Merge pull request #22 from MyriadFlow/fix-profile-edit
Joshua-Ogbonna Nov 12, 2024
5a91103
Merge pull request #23 from MyriadFlow/main
Joshua-Ogbonna Nov 12, 2024
1615626
"Updated deploy.yml workflow to include main branch, modified Docker …
p-shubh Nov 21, 2024
eba70dc
"Update host in ssh-action to use different addresses based on branch"
p-shubh Nov 21, 2024
f4d46f5
"Refactor deploy workflow to separate prod and dev deployments, updat…
p-shubh Nov 21, 2024
f86bfb9
"Remove pull request trigger from deploy workflow"
p-shubh Nov 21, 2024
9cc0f9a
"Renamed and reconfigured deploy jobs in GitHub workflow file"
p-shubh Nov 21, 2024
347751d
"Renamed and swapped deploy jobs for dev and prod environments, updat…
p-shubh Nov 21, 2024
e537850
"Updated deploy.yml to remove directory changes and use specific Dock…
p-shubh Nov 21, 2024
54f0ef8
"Update remote server key in deploy workflow"
p-shubh Nov 21, 2024
d07513e
first commit
auspicious123 Nov 23, 2024
187edae
chore: remove identity until after meeting with Sharlene
Joshua-Ogbonna Nov 28, 2024
c6d1487
chore: replace identity address with basename
Joshua-Ogbonna Nov 28, 2024
1c31599
Merge pull request #24 from MyriadFlow/profile-works
Joshua-Ogbonna Nov 28, 2024
df8745e
chore: remove duplicate address
Joshua-Ogbonna Nov 29, 2024
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
39 changes: 29 additions & 10 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ on:
push:
branches:
- prod
pull_request:
branches:
- prod
- main

jobs:
next-build:
Expand All @@ -21,7 +19,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

# Step 2: Set up Docker Buildx for multi-platform builds (optional)
# Step 2: Set up Docker Buildx for multi-platform builds
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand All @@ -33,6 +31,7 @@ jobs:
username: ${{ secrets.GHCR_USERNAME }}
password: ${{ secrets.GHCR_TOKEN }}

# Step 4: Build and Push Docker Image
- name: Build and Push Docker Image
env:
ENV_FILE: ${{ secrets.DISCOVER_ENV_FILE }}
Expand All @@ -51,12 +50,13 @@ jobs:
docker push $GITHUB_BRANCH_IMAGE
rm -rf .env

ghcr-push:
needs: next-build # Job depends on next-build(above) job
deploy-prod:
name: Deploy to Production
needs: next-build
if: github.ref == 'refs/heads/prod'
runs-on: ubuntu-latest
steps:
- name: Deploy on Production server
if: github.ref == 'refs/heads/prod'
- name: Deploy on Production Server
uses: appleboy/[email protected]
with:
host: ${{ secrets.REMOTE_SERVER_ADDRESS }}
Expand All @@ -65,8 +65,27 @@ jobs:
port: ${{ secrets.SSH_PORT }}
script: |
pwd
cd ~/discover
sudo docker stop discover && sudo docker rm discover && sudo docker rmi discover
sudo docker stop discover && sudo docker rm discover && sudo docker rmi hcr.io/myriadflow/discover:prod
echo ${{ secrets.GHCR_TOKEN }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
sudo docker pull ghcr.io/myriadflow/discover:prod
sudo docker run --name="discover" -p 9082:3000 -d ghcr.io/myriadflow/discover:prod

deploy-dev:
name: Deploy to Development
needs: next-build
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- name: Deploy on Development Server
uses: appleboy/[email protected]
with:
host: ${{ secrets.DEV_REMOTE_SERVER_ADDRESS }}
username: ${{ secrets.SERVER_USERNAME }}
key: ${{ secrets.DEV_REMOTE_SERVER_KEY }}
port: ${{ secrets.SSH_PORT }}
script: |
pwd
sudo docker stop discover && sudo docker rm discover && sudo docker rmi hcr.io/myriadflow/discover:main
echo ${{ secrets.GHCR_TOKEN }} | sudo docker login ghcr.io -u ${{ secrets.GHCR_USERNAME }} --password-stdin
sudo docker pull ghcr.io/myriadflow/discover:main
sudo docker run --name="discover" -p 9082:3000 -d ghcr.io/myriadflow/discover:main
Loading