diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index e0af74b..8182304 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -1,6 +1,20 @@ name: "Test RDE template" on: workflow_dispatch: # allows manual triggering + push: + paths: + - 'templates/rde/flake.lock' + - 'templates/rde/**/*.nix' + - 'templates/rde/**/*.sh' + - 'templates/rde/**/*.lua' + - '.github/workflows/check.yml' + pull_request: + paths: + - 'templates/rde/flake.lock' + - 'templates/rde/**/*.nix' + - 'templates/rde/**/*.sh' + - 'templates/rde/**/*.lua' + - '.github/workflows/check.yml' concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true diff --git a/.github/workflows/check_ed.yml b/.github/workflows/check_ed.yml index 497d060..350c013 100644 --- a/.github/workflows/check_ed.yml +++ b/.github/workflows/check_ed.yml @@ -1,16 +1,9 @@ -name: "Test ed template" +name: "Test ed template MacOS" on: - workflow_dispatch: + workflow_dispatch: # allows manual triggering push: - paths: - - 'templates/ed/**' - - 'tests/ed/**' - - '.github/workflows/check_ed.yml' - pull_request: - paths: - - 'templates/ed/**' - - 'tests/ed/**' - - '.github/workflows/check_ed.yml' + branches: + - 'update_rde' concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -19,105 +12,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest] + os: [macos-latest, ubuntu-latest] steps: - uses: actions/checkout@v6 - uses: cachix/install-nix-action@v31 with: - github_access_token: ${{ github.token }} + github_access_token: ${{ secrets.GITHUB_TOKEN }} - uses: cachix/cachix-action@v17 with: name: rde authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: rstats-on-nix, nix-community - - - name: Build template - run: nix build ./templates/ed - - - name: Test R script - env: - NO_NUSHELL: '1' - run: | - cd templates/ed - nix develop --command bash -c "Rscript ${{ github.workspace }}/tests/ed/test.R" - - - name: Test Python script (disabled by default) - env: - NO_NUSHELL: '1' - run: | - cd templates/ed - nix develop --command bash -c "python3 ${{ github.workspace }}/tests/ed/test.py" || echo "SKIP: Python packages not enabled" - - test-with-python: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31 - with: - github_access_token: ${{ github.token }} - - uses: cachix/cachix-action@v17 - with: - name: rde - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - extraPullNames: rstats-on-nix, nix-community - - - name: Setup test directory with Python enabled - run: | - TEST_DIR=$(mktemp -d) - cp -r templates/ed/. "$TEST_DIR/" - cd "$TEST_DIR" - sed -i 's/python[[:space:]]*=[[:space:]]*false;/python = true;/' flake.nix - grep -q "python[[:space:]]*=[[:space:]]*true;" flake.nix || { - echo "Error: Failed to enable Python in flake.nix" - exit 1 - } - echo "TEST_DIR=$TEST_DIR" >> $GITHUB_ENV - - - name: Build with Python enabled - run: | - cd "$TEST_DIR" - nix build - - - name: Test Python packages - env: - NO_NUSHELL: '1' - run: | - cd "$TEST_DIR" - nix develop --command bash -c "python3 ${{ github.workspace }}/tests/ed/test.py" - - test-with-julia: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v6 - - uses: cachix/install-nix-action@v31 - with: - github_access_token: ${{ github.token }} - - uses: cachix/cachix-action@v17 - with: - name: rde - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - extraPullNames: rstats-on-nix, nix-community - - - name: Setup test directory with Julia enabled - run: | - TEST_DIR=$(mktemp -d) - cp -r templates/ed/. "$TEST_DIR/" - cd "$TEST_DIR" - sed -i 's/julia[[:space:]]*=[[:space:]]*false;/julia = true;/' flake.nix - grep -q "julia[[:space:]]*=[[:space:]]*true;" flake.nix || { - echo "Error: Failed to enable Julia in flake.nix" - exit 1 - } - echo "TEST_DIR=$TEST_DIR" >> $GITHUB_ENV - - - name: Build with Julia enabled - run: | - cd "$TEST_DIR" - nix build - - - name: Test Julia packages - env: - NO_NUSHELL: '1' - run: | - cd "$TEST_DIR" - # nix develop --command bash -c "julia ${{ github.workspace }}/tests/ed/test.jl" + - run: nix build ./templates/ed diff --git a/.github/workflows/check_macos.yml b/.github/workflows/check_macos.yml index ad9d3ed..3b8e6f2 100644 --- a/.github/workflows/check_macos.yml +++ b/.github/workflows/check_macos.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: # allows manual triggering push: branches: - - 'update_ed' + - 'update_rde' concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -23,4 +23,5 @@ jobs: name: rde authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: rstats-on-nix, nix-community + - run: nix build ./templates/rde - run: nix build ./templates/ed diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 4b3cb00..96cb868 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -26,7 +26,7 @@ jobs: uses: DeterminateSystems/update-flake-lock@v28 with: token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} - branch: update_ed + branch: update_rde path-to-flake-dir: "templates/ed" pr-title: "Update RDE flake.lock" # Title of PR to be created pr-labels: | # Labels to be set on the PR diff --git a/templates/ed/flake.lock b/templates/ed/flake.lock index feb65be..e197c74 100644 --- a/templates/ed/flake.lock +++ b/templates/ed/flake.lock @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1779357205, + "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1", "type": "github" }, "original": { diff --git a/templates/ed/flake.nix b/templates/ed/flake.nix index 07603fa..faccae8 100644 --- a/templates/ed/flake.nix +++ b/templates/ed/flake.nix @@ -131,9 +131,7 @@ shellHook = nvimConfig.lib.shellHook evalResult.config + '' - if [ -z "''${NO_NUSHELL:-}" ]; then - exec nu - fi + exec nu ''; }; }); diff --git a/tests/ed/test.R b/tests/ed/test.R deleted file mode 100755 index ad2967a..0000000 --- a/tests/ed/test.R +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env Rscript - -packages <- c("arrow", "data.table", "fixest", "nvimcom") -failed <- character(0) - -for (pkg in packages) { - ok <- tryCatch( - { - # nvimcom requires Neovim; skip loading but check it's installed - if (pkg == "nvimcom") { - requireNamespace(pkg, quietly = TRUE) - } else { - library(pkg, character.only = TRUE, quietly = TRUE) - } - TRUE - }, - error = function(e) FALSE - ) - if (!ok) { - failed <- c(failed, pkg) - } -} - -if (length(failed) > 0) { - cat(sprintf("FAIL: %s\n", paste(failed, collapse = ", "))) - quit(status = 1) -} - -cat("PASS: all packages loaded\n") diff --git a/tests/ed/test.jl b/tests/ed/test.jl deleted file mode 100755 index 5971f80..0000000 --- a/tests/ed/test.jl +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env julia - -packages = ["StatsBase"] -failed = String[] - -for pkg in packages - try - @eval using $pkg - catch - push!(failed, pkg) - end -end - -if !isempty(failed) - @error "FAIL: $(join(failed, ", "))" - exit(1) -end - -println("PASS: all packages loaded") diff --git a/tests/ed/test.py b/tests/ed/test.py deleted file mode 100755 index b893419..0000000 --- a/tests/ed/test.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python3 -import sys - -packages = ["requests"] -failed = [] - -for pkg in packages: - try: - __import__(pkg) - except ImportError: - failed.append(pkg) - -if failed: - sys.stderr.write(f"FAIL: {', '.join(failed)}\n") - sys.exit(1) - -print("PASS: all packages loaded")