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

Release #35

Merged
merged 4 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions .github/sync_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Update Test Branch

on:
push:
branches: [main]

permissions: write-all

jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Git User
run: |
git config user.name "GitHub Action"
git config user.email "<EMAIL>"

- name: Update Test Branch
run: |
git checkout main
git fetch origin
git checkout release
git pull
git rebase origin/main
git push origin release --force

31 changes: 31 additions & 0 deletions .github/workflows/sync_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Update Test Branch

on:
push:
branches: [main]

permissions: write-all

jobs:
sync:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup Git User
run: |
git config user.name "GitHub Action"
git config user.email "<EMAIL>"

- name: Update Test Branch
run: |
git checkout main
git fetch origin
git checkout release
git pull
git rebase origin/main
git push origin release --force

4 changes: 3 additions & 1 deletion uploader/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ services:
- ./uploader/.env
depends_on:
- uploader-db
restart: always
volumes:
- /usr/local/docker-config/aws_uploads/:/gic_query_results/
- $DOCKER_CONFIG_DIR/aws_uploads/:/gic_query_results/
networks:
- hpdsNet
- picsure
Expand All @@ -34,6 +35,7 @@ services:
retries: 10
networks:
- picsure
restart: always
volumes:
- /usr/local/pic-sure-services/uploader/data/seed.sql:/docker-entrypoint-initdb.d/seed.sql:ro
- uploader-db-data:/var/lib/mysql
Expand Down
3 changes: 2 additions & 1 deletion uploader/env-proto
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ DATA_UPLOAD_DB_USER=datauploaduser
DATA_UPLOAD_DB_ROOT_PASS=mycoolpassword

FILE_SHARING_ROOT=/gic_query_results
DOCKER_CONFIG_DIR=/usr/local/picsure/config/

INSTITUTIONS=bch-dev
HOME_INSTITUTION_NAME=bch-dev
HOME_INSTITUTION_DISPLAY=BCH
HOME_INSTITUTION_LONG_DISPLAY=Boston Children's Hospital

DEBUG_VARS=
PROXY_VARS=
PROXY_VARS=
Loading