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.

Sign up for GitHub

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

Jump to bottom

Staging -> dev #432

Merged
merged 16 commits into from
Oct 9, 2023
Merged

Staging -> dev #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6c2c157
Merge pull request #386 from dgidb/staging
jsstevenson Jun 2, 2023
9fb6b82
Merge branch 'main' of github.com:dgidb/dgidb-v5
acoffman Jun 21, 2023
b6c6cec
Merge branch 'dev'
acoffman Jun 21, 2023
00ed88e
disable strict build in github actions for now
acoffman Jun 21, 2023
f4463b1
set variable directly in build command
acoffman Jun 21, 2023
86598b1
remove key entries if nil
acoffman Jun 21, 2023
0c6b175
auth differently when CI is set
acoffman Jun 21, 2023
3ea1026
add libraries required for ssh auth
acoffman Jun 21, 2023
eefea28
build command is production, even though its the main branch
acoffman Jun 21, 2023
9626050
s/production/prod
acoffman Jun 21, 2023
f3ed0a2
Automated frontend build
acoffman Jun 21, 2023
e95623a
fixing merge conflicts from main to staging
katiestahl Oct 9, 2023
0a8a1a2
Fix merge conflicts of main to staging
katiestahl Oct 9, 2023
c683f46
removing stale file
katiestahl Oct 9, 2023
777b337
removing stale file
katiestahl Oct 9, 2023
b00b120
Automated frontend build
katiestahl Oct 9, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build_client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- run: rm -rf public/*
working-directory: ./server

- run: CI=false yarn build:${{ inputs.branch }}
- run: CI=false yarn build:${{ inputs.branch == 'main' && 'prod' || inputs.branch }}
working-directory: ./client

- run: cp -r ../../client/build/* .
Expand Down
13 changes: 4 additions & 9 deletions client/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4391,15 +4391,10 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"

caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181:
version "1.0.30001191"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001191.tgz#bacb432b6701f690c8c5f7c680166b9a9f0843d9"
integrity sha512-xJJqzyd+7GCJXkcoBiQ1GuxEiOBCLQ0aVW9HMekifZsAVGdj5eJ4mFB9fEhSHipq9IOk/QXFJUiIr9lZT+EsGw==

caniuse-lite@^1.0.30001317:
version "1.0.30001323"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001323.tgz#a451ff80dec7033016843f532efda18f02eec011"
integrity sha512-e4BF2RlCVELKx8+RmklSEIVub1TWrmdhvA5kEUueummz1XyySW0DVk+3x9HyhU9MuWTa2BhqLgEuEmUwASAdCA==
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001181, caniuse-lite@^1.0.30001317:
version "1.0.30001546"
resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz"
integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==

case-sensitive-paths-webpack-plugin@^2.4.0:
version "2.4.0"
Expand Down