From ed5f179b6b769d7819b0db0764077c4d96fbae26 Mon Sep 17 00:00:00 2001 From: "Recle E. Vibal" Date: Wed, 30 Nov 2022 15:09:22 +0800 Subject: [PATCH 1/2] Fix: Changes cypress paths in CI template Changes working directory for cypress from .rhino/node to .rhino, and project path from root/tests to ../tests. All node stuff are now in .rhino and not in .rhino/node. When cypress run tests, cypress looks for cypress.json in .rhino/root/tests when it should look at the ./tests. Cypress seems to be still stuck in .rhino, so it needs to move a directory higher (..) to locates tests/ and cypress.json. --- inst/templates/github_ci/dot.github/workflows/rhino-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/templates/github_ci/dot.github/workflows/rhino-test.yml b/inst/templates/github_ci/dot.github/workflows/rhino-test.yml index dd376b4b..4af1e268 100644 --- a/inst/templates/github_ci/dot.github/workflows/rhino-test.yml +++ b/inst/templates/github_ci/dot.github/workflows/rhino-test.yml @@ -79,6 +79,6 @@ jobs: if: always() uses: cypress-io/github-action@v2 with: - working-directory: .rhino/node # Created by earlier commands which use Node.js + working-directory: .rhino # Created by earlier commands which use Node.js start: npm run run-app - project: root/tests + project: ../tests From 795d62590be49ec708f82f17196c1ca0ba38e945 Mon Sep 17 00:00:00 2001 From: "Recle E. Vibal" Date: Wed, 30 Nov 2022 18:29:38 +0800 Subject: [PATCH 2/2] Chore: Bumps dev version; updates NEWS --- DESCRIPTION | 2 +- NEWS.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 075b24aa..7a954423 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rhino Title: A Framework for Enterprise Shiny Applications -Version: 1.2.0.9000 +Version: 1.2.0.9001 Authors@R: c( person("Kamil", "Żyła", role = c("aut", "cre"), email = "opensource+kamil@appsilon.com"), diff --git a/NEWS.md b/NEWS.md index e6167f4a..4c188ce0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,5 @@ # rhino (development version) +1. Fix Cypress in CI. # [rhino 1.2.0](https://github.com/Appsilon/rhino/releases/tag/v1.2.0)