Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
9276bd1
remove code to remove duplicate dependencies
mihem Feb 15, 2025
7a6f4ad
remove code to remove duplicates two
mihem Feb 15, 2025
b936d30
keep track of seen packages
mihem Feb 15, 2025
fb1f1aa
add environment to track changes for resolve_packag_commit
mihem Feb 15, 2025
23f2125
track packages and commits via tmp file
mihem Feb 16, 2025
222ad64
clean code
mihem Feb 16, 2025
7283399
try fix test dedup mlr3extralearners
mihem Feb 16, 2025
4d150ab
skip post-processing in dedup test
mihem Feb 16, 2025
df53165
improve github workflow dedup
mihem Feb 16, 2025
bb4804a
update dups entries defaul.nix snap
mihem Feb 16, 2025
248dbc1
update snap dups default.nix second try
mihem Feb 16, 2025
d723423
remove comments from dups entry default.nix
mihem Feb 16, 2025
fe7fdc2
try fix dedup github workflow
mihem Feb 16, 2025
111ba37
simplify caching commits
mihem Feb 16, 2025
765bebd
remove cache in tests
mihem Feb 16, 2025
93335f4
clean cache for test fetchgits
mihem Feb 16, 2025
b76e04d
revert dups entries for testing
mihem Feb 16, 2025
a044ca9
update snap default_datathin.nix
mihem Feb 16, 2025
593c8fe
new default.nix for test-dedup
mihem Feb 16, 2025
ba602c7
update snapshot for dups entires
mihem Feb 16, 2025
4c8ad42
remove unnecessary line
mihem Feb 18, 2025
2da4939
improve cleaning cache
mihem Feb 18, 2025
b235120
clean code
mihem Feb 18, 2025
b2e5045
adjust tests
mihem Feb 18, 2025
80abe91
update test_dedup.yaml
mihem Feb 18, 2025
01e88fd
update link and name in test-dedup.yaml
mihem Feb 18, 2025
5b1165f
try to fix clean up in tests
mihem Feb 18, 2025
2607b99
add ignore_cache
mihem Feb 18, 2025
80771ad
update test-dedup.yaml
mihem Feb 18, 2025
f78a2b4
add test for dups
mihem Feb 18, 2025
ae9d058
fix bug which ignored the ignore_cache argument in rix
mihem Feb 18, 2025
95e5164
forgot to add ignore_cache in generate_git_archived
mihem Feb 18, 2025
94c0fb2
fix bugs with ignore_cache
mihem Feb 18, 2025
c61bc6b
pass ignore_cache down to all fetchers
mihem Feb 18, 2025
0d151ed
update duplicate mlr3 test
mihem Feb 18, 2025
271bb10
try fix test-dup.yaml
mihem Feb 18, 2025
e10ef74
try debugging test dup
mihem Feb 18, 2025
a75e343
fix test-dup.yaml
mihem Feb 18, 2025
944eddb
typo
mihem Feb 18, 2025
d16cf0d
changed ignore_cache to dots
b-rodrigues Feb 20, 2025
e102589
ignore_cache -> ignore_remotes_cache
b-rodrigues Feb 20, 2025
a5e056a
document
b-rodrigues Feb 20, 2025
40f6a3c
styler
b-rodrigues Feb 20, 2025
2ea198b
some syntax
b-rodrigues Feb 20, 2025
c145117
Merge pull request #6 from ropensci/handle_remotes_better
mihem Feb 20, 2025
24771b8
ignore_cache -> ignore_remotes_cache in tests
mihem Feb 20, 2025
46a6ddd
improve code logic
mihem Feb 20, 2025
682a571
Revert "improve code logic"
mihem Feb 20, 2025
5c3f12a
improve documentation
mihem Feb 20, 2025
a9ad36d
only use cache_key when not ignoring cache
mihem Feb 20, 2025
1b25c35
fix ignore remotes cache
mihem Feb 23, 2025
19f7023
improve comments
mihem Feb 26, 2025
ba02bed
try to remove post_process function
mihem Feb 26, 2025
0528270
adjust tests after removing post_processing
mihem Feb 26, 2025
4115b43
further adjust tests after removing post_process
mihem Feb 26, 2025
1189e3f
add test to test nish-hash-online
mihem Feb 26, 2025
7e7ed4d
attemt to fix test-dedup-nix-hash-online workflow
mihem Feb 26, 2025
57e77e5
use rspm for github workflow
mihem Feb 26, 2025
9419f38
replace sapply with vapply
mihem Feb 26, 2025
905cb76
Revert "replace sapply with vapply"
mihem Feb 26, 2025
172bca9
Revert "use rspm for github workflow"
mihem Feb 26, 2025
af46824
Revert "attemt to fix test-dedup-nix-hash-online workflow"
mihem Feb 26, 2025
870c699
Revert "add test to test nish-hash-online"
mihem Feb 26, 2025
5e074ab
Merge branch 'main' into remove_duplicate_third
mihem Feb 28, 2025
3b58176
remove skip_post_processing argument
mihem Feb 28, 2025
12f9fa1
fix pass ignore_remotes_cache
mihem Feb 28, 2025
83c387f
fix typo
mihem Feb 28, 2025
0c212f8
add docs for caching
mihem Feb 28, 2025
b8bb34b
rewrote docs about version imcompatibility
mihem Mar 1, 2025
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
13 changes: 5 additions & 8 deletions .github/workflows/test-dedup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,14 @@ jobs:

- name: Build default.nix that results in duplicates
run: |
nix-shell default.nix --run "Rscript -e \"devtools::load_all();rix(date = '2023-12-30', r_pkgs = c('tidyverse', 'mlr3', 'qs', 'matrixStats', 'prospectr', 'Cubist', 'checkmate', 'mlr3misc', 'paradox'), git_pkgs = list(package_name = 'mlr3extralearners', repo_url = 'https://github.com/mlr-org/mlr3extralearners/', commit = '6e2af9ef9ecd420d2be44e9aa2488772bb9f7080'), ide = 'none', project_path = '.', overwrite = TRUE, print = FALSE)\""
nix-shell default.nix --run "Rscript -e \"devtools::load_all();rix(date = '2023-12-30', r_pkgs = c('tidyverse', 'mlr3', 'qs', 'matrixStats', 'prospectr', 'Cubist', 'checkmate', 'mlr3misc', 'paradox'), git_pkgs = list(package_name = 'mlr3extralearners', repo_url = 'https://github.com/mlr-org/mlr3extralearners/', commit = '6e2af9ef9ecd420d2be44e9aa2488772bb9f7080'), ide = 'none', project_path = '.', overwrite = TRUE, print = FALSE, ignore_remotes_cache = FALSE)\""

- name: Download test default.nix without dups
run: |
wget -O dups-entries_default.nix https://raw.githubusercontent.com/ropensci/rix/refs/heads/main/tests/testthat/_snaps/rix/dups-entries_default.nix
wget -O mlr3_default.nix https://raw.githubusercontent.com/mihem/rix/refs/heads/remove_duplicate_third/tests/testthat/testdata/remote-pkgs/mlr3_default.nix

- name: Remove lines starting with # from generated expression
- name: Remove lines starting with `#` from generated expression
run: sed -i '/^#/d' default.nix

- name: Remove empty last line in dups-entries_default.nix
run: sed -i '${/^$/d;}' dups-entries_default.nix

- name: Compare lines
run: diff -q default.nix dups-entries_default.nix || exit 1
- name: Compare lines and fail if different
run: diff -q default.nix mlr3_default.nix || exit 1
45 changes: 45 additions & 0 deletions .github/workflows/test-dup.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Integration tests for keeping duplicates
on:
push:
branches: [main, master]
pull_request:
branches: [main, master]

name: test-dup

permissions:
contents: read

jobs:
devtools:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

- name: Install Nix
uses: DeterminateSystems/nix-installer-action@main

- uses: cachix/cachix-action@v15
with:
name: rstats-on-nix
# If you chose signing key for write access
# signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
# If you chose API tokens for write access OR if you have a private cache
authToken: '${{ secrets.CACHIX_AUTH }}'

- name: Build default.nix that results in duplicates
run: |
nix-shell default.nix --run "Rscript -e \"devtools::load_all();rix(date = '2023-12-30', r_pkgs = c('tidyverse', 'mlr3', 'qs', 'matrixStats', 'prospectr', 'Cubist', 'checkmate', 'mlr3misc', 'paradox'), git_pkgs = list(package_name = 'mlr3extralearners', repo_url = 'https://github.com/mlr-org/mlr3extralearners/', commit = '6e2af9ef9ecd420d2be44e9aa2488772bb9f7080'), ide = 'none', project_path = '.', overwrite = TRUE, print = FALSE, ignore_remotes_cache = TRUE)\""

- name: Download test default.nix with dups
run: |
wget -O mlr3_dups_default.nix https://raw.githubusercontent.com/mihem/rix/refs/heads/remove_duplicate_third/tests/testthat/testdata/remote-pkgs/mlr3_dups_default.nix

- name: Remove lines starting with `#` from generated expression
run: sed -i '/^#/d' default.nix

- name: Compare lines and fail if different
run: diff -q default.nix mlr3_dups_default.nix || exit 1
Loading
Loading