From 657f2e157db73bf3582d598a4756f7cdb35a42c2 Mon Sep 17 00:00:00 2001 From: Joshua Shapiro Date: Thu, 19 Dec 2024 10:28:58 -0500 Subject: [PATCH 1/4] use container for seurat --- .github/workflows/run_seurat-conversion.yml | 23 +++++++-------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/run_seurat-conversion.yml b/.github/workflows/run_seurat-conversion.yml index 6348f40c1..a7bea3f1d 100644 --- a/.github/workflows/run_seurat-conversion.yml +++ b/.github/workflows/run_seurat-conversion.yml @@ -33,27 +33,20 @@ jobs: run-module: if: github.repository_owner == 'AlexsLemonade' runs-on: ubuntu-latest + container: public.ecr.aws/openscpca/cell-type-wilms-tumor-06:latest + defaults: + run: + shell: bash -el {0} steps: - name: Checkout repo uses: actions/checkout@v4 - - name: Set up R - uses: r-lib/actions/setup-r@v2 - with: - r-version: 4.4.0 - use-public-rspm: true - - - name: Install additional dependencies + - name: Install aws-cli run: | - sudo apt-get install -y \ - libhdf5-dev \ - libglpk40 - - - name: Set up renv - uses: r-lib/actions/setup-renv@v2 - with: - working-directory: ${{ env.MODULE_PATH }} + curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" + unzip awscliv2.zip + sudo ./aws/install - name: Download test data env: From fc6d0f426833b331b1af90b8bf0497c11a47e7fc Mon Sep 17 00:00:00 2001 From: Joshua Shapiro Date: Thu, 19 Dec 2024 10:29:59 -0500 Subject: [PATCH 2/4] add workflows to all-modules --- .github/workflows/docker_all-modules.yml | 1 + .github/workflows/run_all-modules.yml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.github/workflows/docker_all-modules.yml b/.github/workflows/docker_all-modules.yml index b383b5624..1e82c4a4a 100644 --- a/.github/workflows/docker_all-modules.yml +++ b/.github/workflows/docker_all-modules.yml @@ -43,6 +43,7 @@ jobs: - cell-type-nonETP-ALL-03 - cell-type-ETP-ALL-03 - cell-type-consensus + - seurat-conversion uses: ./.github/workflows/build-push-docker-module.yml if: github.repository_owner == 'AlexsLemonade' with: diff --git a/.github/workflows/run_all-modules.yml b/.github/workflows/run_all-modules.yml index 1a007b096..7886ec6f7 100644 --- a/.github/workflows/run_all-modules.yml +++ b/.github/workflows/run_all-modules.yml @@ -43,6 +43,9 @@ jobs: cell-type-consensus: uses: ./.github/workflows/run_cell-type-consensus.yml + seurat-conversion: + uses: ./.github/workflows/run_seurat-conversion.yml + ## Add additional modules above this comment, and to the needs list below check-jobs: if: ${{ always() }} @@ -56,6 +59,7 @@ jobs: - cell-type-ETP-ALL-03 - cell-type-nonETP-ALL-03 - cell-type-consensus + - seurat-conversion runs-on: ubuntu-latest steps: - name: Checkout template file From f102d1ab42b2c936cacba686707248a1d2665ada Mon Sep 17 00:00:00 2001 From: Joshua Shapiro Date: Thu, 19 Dec 2024 11:44:30 -0500 Subject: [PATCH 3/4] Use the correct container --- .github/workflows/run_seurat-conversion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_seurat-conversion.yml b/.github/workflows/run_seurat-conversion.yml index a7bea3f1d..7e6dd4463 100644 --- a/.github/workflows/run_seurat-conversion.yml +++ b/.github/workflows/run_seurat-conversion.yml @@ -33,7 +33,7 @@ jobs: run-module: if: github.repository_owner == 'AlexsLemonade' runs-on: ubuntu-latest - container: public.ecr.aws/openscpca/cell-type-wilms-tumor-06:latest + container: public.ecr.aws/openscpca/seurat-conversion:latest defaults: run: shell: bash -el {0} From 021757bed887abe18facfe7cb4181759717a078f Mon Sep 17 00:00:00 2001 From: Joshua Shapiro Date: Thu, 19 Dec 2024 11:54:59 -0500 Subject: [PATCH 4/4] no sudo --- .github/workflows/run_seurat-conversion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_seurat-conversion.yml b/.github/workflows/run_seurat-conversion.yml index 7e6dd4463..4c27dc0ed 100644 --- a/.github/workflows/run_seurat-conversion.yml +++ b/.github/workflows/run_seurat-conversion.yml @@ -46,7 +46,7 @@ jobs: run: | curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" unzip awscliv2.zip - sudo ./aws/install + ./aws/install - name: Download test data env: