Skip to content

Commit aa5fd34

Browse files
committed
test_change
1 parent 4a8f26c commit aa5fd34

30 files changed

Lines changed: 15228 additions & 98 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"da5f745551bd38dd9bb0785f3e169675": {
3+
"time": 1756144225,
4+
"data": "data-1542fe3856c.rds"
5+
}
6+
}

.github/workflows/docker-ci.yml

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,40 +18,43 @@ jobs:
1818
steps:
1919
- name: Checkout
2020
uses: actions/checkout@v4
21-
2221
- name: Get scdrake package version from DESCRIPTION
2322
run: |
2423
pkg_version=$(grep -P '^Version: \d+\.\d+\.\d+$' DESCRIPTION | cut -d' ' -f2)
2524
echo "pkg_version=$pkg_version" >> $GITHUB_ENV
2625
echo "scdrake package version: $pkg_version"
27-
2826
- name: Check that tag matches package version in DESCRIPTION
2927
if: github.event_name == 'release'
3028
run: |
3129
echo "pkg_version: $pkg_version"
3230
test -n "$pkg_version" || (echo "'Version:' not found in DESCRIPTION" && false)
3331
test "v$pkg_version" == "${{ github.event.release.tag_name }}" \
3432
|| (echo "'Version: $pkg_version' in DESCRIPTION does not match current git tag ('${{ github.event.release.tag_name }}')" && false)
35-
3633
- name: Set up QEMU
3734
uses: docker/setup-qemu-action@v3
38-
3935
- name: Set up Docker Buildx
4036
uses: docker/setup-buildx-action@v3
41-
4237
- name: Login to Docker Hub
4338
uses: docker/login-action@v3
4439
with:
4540
username: ${{ secrets.DOCKERHUB_USERNAME }}
4641
password: ${{ secrets.DOCKERHUB_TOKEN }}
47-
4842
- name: Free disk space
4943
run: |
5044
sudo rm -rf \
5145
/usr/share/dotnet /usr/local/lib/android /opt/ghc \
5246
/usr/local/share/powershell /usr/share/swift /usr/local/.ghcup \
5347
/usr/lib/jvm || true
54-
48+
# - name: Free Disk Space (Ubuntu)
49+
# uses: jlumbroso/free-disk-space@main
50+
# with:
51+
# tool-cache: false
52+
# android: true
53+
# dotnet: true
54+
# haskell: true
55+
# large-packages: false
56+
# docker-images: false
57+
# swap-storage: true
5558
- name: Build and export test image
5659
uses: docker/build-push-action@v5
5760
with:
@@ -62,7 +65,6 @@ jobs:
6265
tags: ${{ env.IMAGE }}:${{ env.TEST_TAG }}
6366
cache-from: type=gha
6467
cache-to: type=gha,mode=min
65-
6668
- name: Run test image
6769
run: |
6870
docker run -d \
@@ -71,7 +73,6 @@ jobs:
7173
-e USERID=$(id -u) \
7274
-e GROUPID=$(id -g) \
7375
${{ env.IMAGE }}:${{ env.TEST_TAG }}
74-
7576
- name: Render README.md
7677
run: |
7778
docker exec -w /home/rstudio/scdrake_source scdrake_test \
@@ -80,31 +81,23 @@ jobs:
8081
git diff --exit-code README.md
8182
exit_code=$?
8283
set -e
84+
# If exit code is > 0, then there are changes and README.md was not commited
8385
test $exit_code -eq 0 || (echo "README.Rmd has changed, but an updated version of README.md was not included in this commit" && false)
84-
85-
- name: Test image (skip all pipeline tests)
86+
- name: Test image
8687
run: |
87-
docker exec -w /home/rstudio/scdrake_source \
88-
-e SCDRAKE_TEST_RUN_PIPELINE=FALSE \
89-
-e SCDRAKE_TEST_RUN_PIPELINE_SINGLE_SAMPLE_FULL=FALSE \
90-
-e SCDRAKE_TEST_RUN_PIPELINE_SINGLE_SAMPLE_FULL_SCT=FALSE \
91-
-e SCDRAKE_TEST_RUN_PIPELINE_INTEGRATION=FALSE \
92-
scdrake_test \
93-
r --interactive -L /usr/local/lib/R/site-library -t dev/run_tests.R \
88+
docker exec -w /home/rstudio/scdrake_source scdrake_test \
89+
r --interactive -L /usr/local/lib/R/site-library -t dev/run_tests.R --no-test-pipeline \
9490
--output-dir /home/rstudio/scdrake_test_summary
95-
9691
- name: Copy test results
9792
if: always()
9893
run: |
9994
sudo docker cp scdrake_test:/home/rstudio/scdrake_test_summary /
100-
10195
- name: Upload test results
10296
if: always()
103-
uses: actions/upload-artifact@v4
97+
uses: actions/upload-artifact@v3
10498
with:
10599
name: scdrake_test_summary
106100
path: /scdrake_test_summary/
107-
108101
- name: Docker meta
109102
id: meta
110103
uses: docker/metadata-action@v5
@@ -113,7 +106,6 @@ jobs:
113106
tags: |
114107
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
115108
type=semver,pattern={{version}}
116-
117109
- name: Build and push image to Docker Hub
118110
uses: docker/build-push-action@v5
119111
with:
@@ -126,26 +118,22 @@ jobs:
126118
labels: ${{ steps.meta.outputs.labels }}
127119
cache-from: type=gha
128120
cache-to: type=gha,mode=min
129-
130121
- name: Remove devel mode from _pkgdown.yml
131122
if: github.event_name == 'release'
132123
run: |
133124
docker exec -w /home/rstudio/scdrake_source scdrake_test \
134125
bash -c 'sed -i "/development:/d" _pkgdown.yml; sed -i "/mode: devel/d" _pkgdown.yml'
135-
136126
- name: Build pkgdown site
137127
run: |
138128
docker exec -w /home/rstudio/scdrake_source scdrake_test \
139129
Rscript -e "pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)"
140-
141130
- name: Deploy to GitHub pages (stable docs)
142131
if: github.event_name == 'release'
143132
uses: JamesIves/github-pages-deploy-action@v4.4.1
144133
with:
145134
clean: false
146135
branch: gh-pages
147136
folder: docs
148-
149137
- name: Deploy to GitHub pages (devel docs)
150138
if: github.event_name == 'push'
151139
uses: JamesIves/github-pages-deploy-action@v4.4.1
@@ -154,7 +142,6 @@ jobs:
154142
branch: gh-pages
155143
folder: docs/dev
156144
target-folder: dev
157-
158145
- name: Rollback release
159146
if: github.event_name == 'release' && failure()
160147
uses: author/action-rollback@stable

.local/share/rstudio/history_database

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,8 @@
1111
1756137218223:yq_version <- system2(yq_binary, "-V", stdout = TRUE)
1212
1756137236043:scdrake::check_yq()
1313
1756139940929:scdrake::init_project(set_active_project = F,download_example_data = T)
14+
1756144128936:install.packages("scrapper")
15+
1756144163257:BiocManager::install("scrapper")
16+
1756144192448:renv::snapshot()
17+
1756144215558:renv::snapshot()
18+
1756145529754:testthat::snapshot_accept('project')
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
~/dev/run_check.R
2-
~/dev/run_tests.R
1+
~/DESCRIPTION
2+
~/tests/testthat/test-run_pipeline.R
33
~/tests/testthat/setup.R
44
~/tests/testthat.R
5+
~/dev/run_tests.R
6+
~/renv.lock
7+
~/tests/testthat/test-run_pipeline_vignettes.R
8+
~/dev/run_check.R
59
~/.github/workflows/update-docs.yaml.disabled
610
~/tests/testthat/run_pipeline_config_patches/integration/01_integration.default.yaml
711
~/tests/testthat/run_pipeline_config_patches/single_sample_pbmc3k/01_input_qc.default.yaml
812
~/tests/testthat/run_pipeline_config_patches/single_sample_pbmc1k_full_sct/01_input_qc.default.yaml
913
~/tests/testthat/run_pipeline_config_patches/single_sample_pbmc1k_full/02_norm_clustering.default.yaml
1014
~/tests/testthat/run_pipeline_config_patches/single_sample_pbmc1k_full/01_input_qc.default.yaml
1115
~/tests/testthat/run_pipeline_config_patches/single_sample_pbmc1k/01_input_qc.default.yaml
12-
~/.github/workflows/docker-ci.yml
13-
~/_pkgdown.yml
14-
~/tests/testthat/test-run_pipeline.R
15-
~/tests/testthat/test-plans.R

.local/share/rstudio/notebooks/paths

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/home/rstudio/.github/workflows/update-docs.yaml.disabled="9608941D"
33
/home/rstudio/.gitignore="EB0E8E64"
44
/home/rstudio/.renvignore="E0757FBB"
5+
/home/rstudio/DESCRIPTION="1BE3B9CA"
56
/home/rstudio/Dockerfile="5F49DAE4"
67
/home/rstudio/R/plans_single_sample.R="84CF5DF0"
78
/home/rstudio/R/scdrake-package.R="A8949BB5"
@@ -39,6 +40,7 @@
3940
/home/rstudio/tests/testthat/test-plans.R="FDC7F0AD"
4041
/home/rstudio/tests/testthat/test-project.R="97A17A8A"
4142
/home/rstudio/tests/testthat/test-run_pipeline.R="89E36FE0"
43+
/home/rstudio/tests/testthat/test-run_pipeline_vignettes.R="2FFA5AFE"
4244
/home/rstudio/tests/testthat/yq_test_files/dest.yaml="8D09F3ED"
4345
/home/rstudio/vignettes/_drake_parallelism.Rmd="25F9EA33"
4446
/home/rstudio/vignettes/_version.Rmd="B971AEF9"
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
{
22
"sortOrder": [
3+
{
4+
"columnIndex": 4,
5+
"ascending": false
6+
},
37
{
48
"columnIndex": 2,
59
"ascending": true
610
}
711
],
8-
"path": "~"
12+
"path": "~/tests/testthat"
913
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"activeTab": 1
2+
"activeTab": 0
33
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"source_window_id": "",
33
"Source": "Source",
4-
"cursorPosition": "163,51",
5-
"scrollLine": "150"
4+
"cursorPosition": "86,14",
5+
"scrollLine": "82"
66
}

0 commit comments

Comments
 (0)