Skip to content
Open
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
12 changes: 11 additions & 1 deletion .github/workflows/build-syntaxinterface.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,14 @@ jobs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- id: set-matrix
# when updating windows-2022 to windows-latest (2026 as if writing) make sure to change "2022" in the steps below
run: |
ALL='{"include":[
{"os":"ubuntu-latest", "arch":"x86_64","artifact":"libSyntaxInterface-linux-x86_64.so", "lib_file":"libSyntaxInterface.so"},
{"os":"ubuntu-24.04-arm", "arch":"arm64", "artifact":"libSyntaxInterface-linux-arm64.so", "lib_file":"libSyntaxInterface.so"},
{"os":"macos-15-intel", "arch":"x86_64","artifact":"libSyntaxInterface-darwin-x86_64.dylib", "lib_file":"libSyntaxInterface.dylib"},
{"os":"macos-15", "arch":"arm64", "artifact":"libSyntaxInterface-darwin-arm64.dylib", "lib_file":"libSyntaxInterface.dylib"},
{"os":"windows-latest", "arch":"x86_64","artifact":"SyntaxInterface-windows-x86_64.dll", "lib_file":"SyntaxInterface.dll"}
{"os":"windows-2022", "arch":"x86_64","artifact":"SyntaxInterface-windows-x86_64.dll", "lib_file":"SyntaxInterface.dll"}
]}'
FILTER='${{ github.event.inputs.os_filter }}'
if [ -z "$FILTER" ]; then
Expand Down Expand Up @@ -150,6 +151,15 @@ jobs:
copy C:\rtools45\ucrt64\bin\make.exe C:\rtools45\ucrt64\bin\mingw32-make.exe
)
)
echo C:\rtools45\ucrt64\bin>>"%GITHUB_PATH%"

- name: Test Rtools45 ucrt64 compiler (Windows)
if: runner.os == 'Windows'
shell: cmd
run: |
echo int main(void) { return 0; } > "%RUNNER_TEMP%\test.c"
gcc "%RUNNER_TEMP%\test.c" -o "%RUNNER_TEMP%\test.exe"
"%RUNNER_TEMP%\test.exe"

# ---- Install Qt from source and build static ----

Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/rcmdcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
on:
push:
paths: ['**.R', '**.svg', '**.Rd', 'DESCRIPTION', 'NAMESPACE', '.github/workflows/rcmdcheck.yml']
pull_request:
paths: ['**.R', '**.svg', '**.Rd', 'DESCRIPTION', 'NAMESPACE', '.github/workflows/rcmdcheck.yml']

name: R-CMD-check

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config: # current jasp version, latest r-release, and development
- {os: windows-latest, r: '4.5.2'}
- {os: macOS-latest, r: '4.5.2'}
- {os: ubuntu-latest, r: '4.5.2'}
- {os: ubuntu-latest, r: 'release'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2

# adapted from https://github.com/r-lib/actions/blob/v2/examples/check-standard.yaml
- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
Comment thread
github-advanced-security[bot] marked this conversation as resolved.
Fixed
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e
# ---------- GitHub Release configuration ----------
# Pre-built binaries are hosted as GitHub Release assets.
# The build-syntaxinterface.yml workflow produces these.
GITHUB_RELEASE_TAG="${JASPSYNTAX_RELEASE_TAG:-v0.97.0}"
GITHUB_RELEASE_TAG="${JASPSYNTAX_RELEASE_TAG:-v0.97.1}"
GITHUB_RELEASE_REPO="${JASPSYNTAX_RELEASE_REPO:-jasp-stats/jaspSyntax}"
GITHUB_RELEASE_URL="https://github.com/${GITHUB_RELEASE_REPO}/releases/download/${GITHUB_RELEASE_TAG}"
SOURCE_BUNDLE_ASSET="SyntaxInterface-sources.tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion configure.win
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set -e

# ---------- GitHub Release configuration ----------
GITHUB_RELEASE_TAG="${JASPSYNTAX_RELEASE_TAG:-v0.97.0}"
GITHUB_RELEASE_TAG="${JASPSYNTAX_RELEASE_TAG:-v0.97.1}"
GITHUB_RELEASE_REPO="${JASPSYNTAX_RELEASE_REPO:-jasp-stats/jaspSyntax}"
GITHUB_RELEASE_URL="https://github.com/${GITHUB_RELEASE_REPO}/releases/download/${GITHUB_RELEASE_TAG}"
SOURCE_BUNDLE_ASSET="SyntaxInterface-sources.tar.gz"
Expand Down
Loading