Skip to content

Commit

Permalink
Merge pull request #730 from dictyBase/feat/staging-deployment
Browse files Browse the repository at this point in the history
Pulling feat/staging-deployment into develop
  • Loading branch information
kodiakhq[bot] authored Apr 29, 2024
2 parents 1d1073b + 30df127 commit fbd70ea
Show file tree
Hide file tree
Showing 38 changed files with 355 additions and 918 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: codecov/codecov-action@v3
call-frontpage-docker-build:
needs: test
uses: dictyBase/workflows/.github/workflows/docker-build-push-repo.yaml@develop
uses: dictyBase/workflows/.github/workflows/docker-build-push-mode.yaml@develop
secrets: inherit
with:
repository: ${{ github.repository }}
Expand All @@ -31,10 +31,19 @@ jobs:
dockerrepo: "dictybase/dicty-frontpage"
call-dsc-docker-build:
needs: test
uses: dictyBase/workflows/.github/workflows/docker-build-push-repo.yaml@develop
uses: dictyBase/workflows/.github/workflows/docker-build-push-mode.yaml@develop
secrets: inherit
with:
repository: ${{ github.repository }}
ref: ${{ github.ref_name }}
dockerfile: "docker/Dockerfile.stock-center"
dockerrepo: "dictybase/stock-center"
call-publication-docker-build:
needs: test
uses: dictyBase/workflows/.github/workflows/docker-build-push-mode.yaml@develop
secrets: inherit
with:
repository: ${{ github.repository }}
ref: ${{ github.ref_name }}
dockerfile: "docker/Dockerfile.publication"
dockerrepo: "dictybase/publication"
33 changes: 33 additions & 0 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: staging integration
on:
push:
branches:
- staging
jobs:
call-frontpage-docker-build:
uses: dictyBase/workflows/.github/workflows/docker-build-push-mode.yaml@develop
secrets: inherit
with:
repository: ${{ github.repository }}
ref: ${{ github.ref_name }}
dockerfile: "docker/Dockerfile.frontpage"
dockerrepo: "dictybase/dicty-frontpage"
build_state: staging
call-dsc-docker-build:
uses: dictyBase/workflows/.github/workflows/docker-build-push-mode.yaml@develop
secrets: inherit
with:
build_state: staging
repository: ${{ github.repository }}
ref: ${{ github.ref_name }}
dockerfile: "docker/Dockerfile.stock-center"
dockerrepo: "dictybase/stock-center"
call-publication-docker-build:
uses: dictyBase/workflows/.github/workflows/docker-build-push-mode.yaml@develop
secrets: inherit
with:
build_state: staging
repository: ${{ github.repository }}
ref: ${{ github.ref_name }}
dockerfile: "docker/Dockerfile.publication"
dockerrepo: "dictybase/publication"
13 changes: 13 additions & 0 deletions apps/dicty-frontpage/.env.staging
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
VITE_APP_BASENAME='/'
VITE_APP_STOCKCENTER_URL="https://staging.dictycr.org/stockcenter"
VITE_APP_FRONTPAGE_URL="https://staging.dictycr.org"
VITE_APP_PUBLICATION_URL="https://staging.dictycr.org/publication"
VITE_APP_GA_TRACKING_ID=''
VITE_RSS_URL="https://pubmed.ncbi.nlm.nih.gov/rss/search/1xSjLNP-2lGAmjK0hZKzE4pxRxyAAh7BAEFNc5kyVReacTxspv/?limit=20&utm_campaign=pubmed-2&fc=20231211102630"
VITE_LOGTO_ENDPOINT="https://staginglogto.dictycr.org"
VITE_LOGTO_APPID="5zlsnfx4pi7pnwbojs6oe"
VITE_APP_GRAPHQL_SERVER="https://staginggraphql.dictycr.org"
VITE_APP_LOGTO_API_FIRST_RESOURCE="https://staginguser.dictycr.dev/api"
VITE_APP_LOGTO_API_SECOND_RESOURCE="https://content.stagingdictycr.org/api"
VITE_APP_FOOTER_JSON='https://raw.githubusercontent.com/dictyBase/migration-data/master/footer/footer-condensed.json'
VITE_APP_NAVBAR_JSON='https://raw.githubusercontent.com/dictyBase/migration-data/master/navbar/navbar.json'
6 changes: 5 additions & 1 deletion apps/dicty-frontpage/src/app/layout/FrontPageApp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ const FrontPageApp = () => {
return (
<div className={classes.body}>
<HeaderWithAuth clientRouter={frontpageRouter} />
<NavbarWithAuth theme={navTheme} />
<NavbarWithAuth
frontPageUrl={import.meta.env.VITE_APP_FRONTPAGE_URL}
stockCenterUrl={import.meta.env.VITE_APP_STOCKCENTER_URL}
theme={navTheme}
/>
<main className={classes.main}>
<Container maxWidth="xl">
<ErrorBoundary>
Expand Down
2 changes: 1 addition & 1 deletion apps/genome-page/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"dicty-components-header-footer": "dictybase/dicty-components-header-footer#11.0.1",
"dicty-components-login": "dictybase/dicty-components-login#4.1.1",
"dicty-components-navbar": "github:dictyBase/dicty-components-navbar#2.0.0",
"dicty-graphql-schema": "https://github.com/dictyBase/dicty-graphql-schema#v1.14.0",
"dicty-graphql-schema": "https://github.com/dictyBase/dicty-graphql-schema#v1.14.1",
"dicty-hooks": "dictybase/dicty-hooks#3.0.0",
"element-remove": "^1.0.4",
"eslint-config-next": "^14.0.3",
Expand Down
7 changes: 7 additions & 0 deletions apps/publication/.env.development
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
NEXT_PUBLIC_BASENAME='/publication'
NEXT_PUBLIC_GA_TRACKING_ID=''
NEXT_PUBLIC_FRONTPAGE_URL="https://dictybase.dev"
NEXT_PUBLIC_STOCKCENTER_URL="https://dictybase.dev/stockcenter"
NEXT_PUBLIC_PUBLICATION_URL="https://dictybase.dev/publication"
NEXT_PUBLIC_GRAPHQL_SERVER='https://graphql.dictybase.dev'
NEXT_PUBLIC_FOOTER_JSON='https://raw.githubusercontent.com/dictyBase/migration-data/master/footer/footer-condensed.json'
NEXT_PUBLIC_NAVBAR_JSON='https://raw.githubusercontent.com/dictyBase/migration-data/master/navbar/navbar.json'
NEXT_PUBLIC_DEPLOY_ENV='development'
NEXT_LOGTO_ENDPOINT="https://logto.dictybase.dev"
NEXT_LOGTO_APPID="cu7h1redzdyerxcmc829d"
NEXT_APP_LOGTO_API_FIRST_RESOURCE="https://user.dictybase.dev/api"
NEXT_APP_LOGTO_API_SECOND_RESOURCE="https://content.dictybase.dev/api"
13 changes: 13 additions & 0 deletions apps/publication/.env.staging
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
NEXT_PUBLIC_BASENAME='/publication'
NEXT_PUBLIC_GA_TRACKING_ID=''
NEXT_PUBLIC_GRAPHQL_SERVER='https://staginggraphql.dictycr.dev'
NEXT_PUBLIC_FRONTPAGE_URL="https://dictybase.dev"
NEXT_PUBLIC_STOCKCENTER_URL="https://dictybase.dev/stockcenter"
NEXT_PUBLIC_PUBLICATION_URL="https://dictybase.dev/publication"
NEXT_PUBLIC_FOOTER_JSON='https://raw.githubusercontent.com/dictyBase/migration-data/master/footer/footer-condensed.json'
NEXT_PUBLIC_NAVBAR_JSON='https://raw.githubusercontent.com/dictyBase/migration-data/master/navbar/navbar.json'
NEXT_PUBLIC_DEPLOY_ENV='staging'
NEXT_LOGTO_ENDPOINT="https://staginglogto.dictycr.org"
NEXT_LOGTO_APPID="5zlsnfx4pi7pnwbojs6oe"
NEXT_APP_LOGTO_API_FIRST_RESOURCE="https://staginguser.dictycr.dev/api"
NEXT_APP_LOGTO_API_SECOND_RESOURCE="https://content.stagingdictycr.org/api"
10 changes: 8 additions & 2 deletions apps/publication/next.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
const base = "/publication"

module.exports = {
// eslint-disable-next-line import/no-commonjs, unicorn/prefer-module
const withTM = require("next-transpile-modules")([
"@dictybase/navbar",
"dicty-graphql-schema",
])
// eslint-disable-next-line import/no-commonjs, unicorn/prefer-module
module.exports = withTM({
basePath: base,
swcMinify: true,
output: "standalone",
}
})
11 changes: 6 additions & 5 deletions apps/publication/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": "/publication",
"scripts": {
"dev": "vite",
"dev": "next dev",
"build": "next build",
"start": "next start",
"test-coverage": "jest --coverage",
Expand All @@ -17,24 +17,25 @@
},
"dependencies": {
"@apollo/client": "^3.6.9",
"@dictybase/navbar": "*",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@dictybase/navbar": "*",
"@material-ui/icons": "^4.11.2",
"@mui/material": "^5.2.8",
"@mui/icons-material": "^5.3.1",
"@mui/material": "^5.2.8",
"@rescript/react": "^0.10.3",
"apollo3-cache-persist": "^0.14.1",
"apollo3-cache-persist": "^0.15.0",
"date-fns": "^2.30.0",
"dicty-components-header-footer": "dictybase/dicty-components-header-footer#11.0.1",
"dicty-components-login": "dictybase/dicty-components-login#4.1.1",
"dicty-graphql-schema": "https://github.com/dictyBase/dicty-graphql-schema#v1.14.0",
"dicty-graphql-schema": "https://github.com/dictyBase/dicty-graphql-schema#v1.14.1",
"dicty-hooks": "dictybase/dicty-hooks#3.0.0",
"element-remove": "^1.0.4",
"fontsource-roboto": "^4.0.0",
"jwt-decode": "^3.0.0",
"localforage": "^1.10.0",
"next": "12.2.x",
"next-transpile-modules": "^10.0.1",
"react-ga": "^3.3.1",
"react-helmet": "^6.1.0",
"react-loading-skeleton": "^3.0.1",
Expand Down
184 changes: 0 additions & 184 deletions apps/publication/src/__tests__/Login.test.tsx

This file was deleted.

Loading

0 comments on commit fbd70ea

Please sign in to comment.