Skip to content

Commit

Permalink
fix test condition
Browse files Browse the repository at this point in the history
  • Loading branch information
dramanica committed Dec 9, 2024
1 parent 26da9b7 commit a92f614
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ jobs:
wget https://dalexander.github.io/admixture/binaries/admixture_linux-1.3.0.tar.gz
tar -xvzf admixture_linux-1.3.0.tar.gz
cd ..
echo "$PATH"
echo "$HOME"
mkdir -p /home/runner/.local/bin
cp "$PWD/admixture/dist/admixture_linux-1.3.0/admixture" "/usr/local/bin/admixture"
# echo "$PWD/admixture/dist/admixture_linux-1.3.0" >> "$GITHUB_PATH"
#mkdir -p /home/runner/.local/bin
#cp "$PWD/admixture/dist/admixture_linux-1.3.0/admixture" "/usr/local/bin/admixture"
echo "$PWD/admixture/dist/admixture_linux-1.3.0" >> "$GITHUB_PATH"
- name: Test ADMIXTURE for linux
if: matrix.config.os == 'ubuntu-latest'
Expand Down
3 changes: 1 addition & 2 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ reference:
- autoplot.gt_dapc
- autoplot.gt_cluster_pca
- title: "K-clustering and ADMXITURE"
desc: "Functions for creating, tidying, and visualising `q_matrix` objects."
desc: "Functions for creating, tidying, and visualising `gt_admix` and `q_matrix` objects."
contents:
- gt_admixture
- autoplot.gt_admix
Expand All @@ -107,7 +107,6 @@ reference:
- tidy.q_matrix
- augment.q_matrix
- autoplot.q_matrix
- summary.q_matrix_list
- distruct_colours
- scale_fill_distruct
- theme_distruct
Expand Down
3 changes: 2 additions & 1 deletion tests/testthat/test_gt_admixture.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

# skip if admixture is not installed
skip_if((system2("which", args = "admixture", stdout = NULL) != 0)||!requireNamespace("fastmixturer", quietly = TRUE))
skip_if((system2("which", args = "admixture", stdout = NULL) != 0) && !requireNamespace("fastmixturer", quietly = TRUE))
# set the input file
vcf_path <- system.file("/extdata/anolis/punctatus_t70_s10_n46_filtered.recode.vcf.gz",
package = "tidypopgen")
Expand Down

0 comments on commit a92f614

Please sign in to comment.