From 402bf8fdb6fa383deec9f41ab6626b66258f2918 Mon Sep 17 00:00:00 2001 From: Neli Fonseca Date: Fri, 23 Feb 2024 13:22:56 +0000 Subject: [PATCH 1/2] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 79f5b03..8f0b4c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,5 +16,5 @@ jobs: - name: Test in a sample data run: | - rsync ${{ secrets.BSUB_SERVER }}:${{ secrets.DATA_PATH }}/emd-8117-v30.xml . + rsync ${{ secrets.SRUN_SERVER }}:${{ secrets.DATA_PATH }}/emd-8117-v30.xml . xmllint --noout --schema emdb_schemas/current/emdb_relaxed.xsd emd-8117-v30.xml From 1eb85393603dbe3bf6ba0f78ec47181c4a046c95 Mon Sep 17 00:00:00 2001 From: Neli Fonseca Date: Fri, 23 Feb 2024 13:28:38 +0000 Subject: [PATCH 2/2] Update deployment.yml --- .github/workflows/deployment.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index e62c22d..b944f99 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -12,11 +12,11 @@ jobs: steps: - name: Pull repository run: - ssh ${{ secrets.BSUB_SERVER }} "git -C ${{ secrets.DEPLOY_PATH }}/ pull" + ssh ${{ secrets.SRUN_SERVER }} "git -C ${{ secrets.DEPLOY_PATH }}/ pull" - name: Deploy run: | - ssh ${{ secrets.BSUB_SERVER }} "bsub -K -q datamover 'cd ${{ secrets.DEPLOY_PATH }} && find . -name \"*.xsd\" -exec cp --parents {} ${{ secrets.FTP_PATH2 }}/ \\;'" - ssh ${{ secrets.BSUB_SERVER }} "bsub -K -q datamover 'rsync -av ${{ secrets.DEPLOY_PATH }}/emdb_schemas/ ${{ secrets.FTP_PATH }}/'" + ssh ${{ secrets.SRUN_SERVER }} "srun --job-name=deploy_emdb_prep --time=0:30:00 --mem=1g --partition=datamover --chdir=${{ secrets.DEPLOY_PATH }} bash -c 'find . -name \"*.xsd\" -exec cp --parents {} ${{ secrets.FTP_PATH2 }}/ \\;'" + ssh ${{ secrets.SRUN_SERVER }} "srun --job-name=deploy_emdb_prep --time=0:30:00 --mem=1g --partition=datamover bash -c 'rsync -av ${{ secrets.DEPLOY_PATH }}/emdb_schemas/ ${{ secrets.FTP_PATH }}/'" - name: Send e-mail run: - echo "The EMDB schemas repository was pulled and moved to production." | mail -s "[emdb-schema] EMDB schema has updated" pdb_em@ebi.ac.uk \ No newline at end of file + echo "The EMDB schemas repository was pulled and moved to production." | mail -s "[emdb-schema] EMDB schema has updated" pdb_em@ebi.ac.uk