Skip to content

Commit

Permalink
config changes, new branch
Browse files Browse the repository at this point in the history
  • Loading branch information
feruzm committed Sep 3, 2024
1 parent 27d6ab4 commit f30ae03
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 42 deletions.
22 changes: 7 additions & 15 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Staging CI/CD
on:
push:
branches:
- development
- develop
jobs:
tests:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
Expand Down Expand Up @@ -41,7 +41,7 @@ jobs:
context: ./
file: ./Dockerfile
push: true
tags: ecency/vision:development
tags: ecency/vision-next:develop

- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
Expand All @@ -53,30 +53,22 @@ jobs:
- name: SSH and deploy node app
uses: appleboy/ssh-action@master
env:
USE_PRIVATE: ${{secrets.USE_PRIVATE}}
REDIS_HOST_PASSWORD: ${{secrets.REDIS_HOST_PASSWORD}}
PRIVATE_API_ADDR: ${{secrets.PRIVATE_API_ADDR}}
PRIVATE_API_AUTH: ${{secrets.PRIVATE_API_AUTH}}
HIVESIGNER_CLIENT_SECRET: ${{secrets.HIVESIGNER_CLIENT_SECRET}}
SEARCH_API_ADDR: ${{secrets.SEARCH_API_ADDR}}
SEARCH_API_SECRET: ${{secrets.SEARCH_API_SECRET}}
API_PORT: ${{secrets.API_PORT}}
with:
host: ${{ secrets.SSH_STAGING_HOST }}
username: ${{ secrets.SSH_USERNAME }}
key: ${{ secrets.SSH_KEY }}
port: ${{ secrets.SSH_PORT }}
envs: USE_PRIVATE,REDIS_HOST_PASSWORD,PRIVATE_API_ADDR,PRIVATE_API_AUTH,HIVESIGNER_CLIENT_SECRET,SEARCH_API_ADDR,SEARCH_API_SECRET,API_PORT
envs: PRIVATE_API_ADDR,PRIVATE_API_AUTH,HIVESIGNER_CLIENT_SECRET,API_PORT
script: |
export USE_PRIVATE=$USE_PRIVATE
export REDIS_HOST_PASSWORD=$REDIS_HOST_PASSWORD
export PRIVATE_API_ADDR=$PRIVATE_API_ADDR
export PRIVATE_API_AUTH=$PRIVATE_API_AUTH
export HIVESIGNER_CLIENT_SECRET=$HIVESIGNER_CLIENT_SECRET
export SEARCH_API_ADDR=$SEARCH_API_ADDR
export SEARCH_API_SECRET=$SEARCH_API_SECRET
export API_PORT=$API_PORT
cd ~/vision-staging
git pull origin development
docker pull ecency/vision:development
cd ~/vision-next
git pull origin develop
docker pull ecency/vision-next:develop
docker-compose up -d
45 changes: 21 additions & 24 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/config/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ecency-config.json
config.json
File renamed without changes.
2 changes: 1 addition & 1 deletion src/config/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from "./ecency-config.json";
import config from "./config.json";
import { ComponentType, memo, PropsWithChildren, ReactNode } from "react";
import { QueryClient, useMutation, UseMutationOptions } from "@tanstack/react-query";
import type { DefaultError } from "@tanstack/query-core";
Expand Down
2 changes: 1 addition & 1 deletion src/core/global-store/modules/config-module.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import config from "../../../config/ecency-config.json";
import config from "../../../config/config.json";

export function createConfigState() {
if (!config.visionConfig) {
Expand Down

0 comments on commit f30ae03

Please sign in to comment.