From e0a8dbea9af27ca227ee53248aaa891ffa18f43c Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Tue, 25 Jun 2024 14:05:03 +0200 Subject: [PATCH 1/4] Add extra (#244) Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Co-authored-by: walkowif <59475134+walkowif@users.noreply.github.com> --- .github/workflows/verdepcheck.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/verdepcheck.yaml b/.github/workflows/verdepcheck.yaml index 4a15a21d0..ee203f499 100644 --- a/.github/workflows/verdepcheck.yaml +++ b/.github/workflows/verdepcheck.yaml @@ -28,6 +28,14 @@ on: Strategy to test package dependencies. One of: min_isolate, min_cohort, release, max. required: true type: string + extra-deps: + description: | + Extra dependencies specified similarly as in the `DESCRIPTION` file, + i.e. `" ( )"` where both `` + and `` are optional. Multiple entries are possible separated by `";"`. + required: false + default: "" + type: string additional-env-vars: description: | Extra environment variables, as a 'key=value' pair, with each pair on a new line. @@ -104,10 +112,11 @@ jobs: uses: insightsengineering/r-verdepcheck-action@main with: github-token: ${{ steps.github-token.outputs.token }} - check-args: ${{ inputs.check-args }} + extra-deps: ${{ inputs.extra-deps }} build-args: ${{ inputs.build-args }} - additional-env-vars: ${{ inputs.additional-env-vars }} + check-args: ${{ inputs.check-args }} strategy: ${{ env.strategy }} + additional-env-vars: ${{ inputs.additional-env-vars }} - name: GChat notification 🔔 if: (failure() || cancelled()) && steps.verdepcheck.outcome != 'success' && env.gchat_webhook != '' From 3d3326e9fff79dd5f25d5973bb3f5dba9ee49141 Mon Sep 17 00:00:00 2001 From: pawelru Date: Tue, 25 Jun 2024 12:05:56 +0000 Subject: [PATCH 2/4] [skip actions] Bump version to 0.1.0.9168 --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index e9e24ac11..148707ee1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: r.pkg.template Title: R Package Template -Version: 0.1.0.9167 -Date: 2024-06-18 +Version: 0.1.0.9168 +Date: 2024-06-25 Authors@R: person("insightsengineering", , , "insightsengineering@example.com", role = c("aut", "cre")) Description: R package template with GitHub Actions workflows included. diff --git a/NEWS.md b/NEWS.md index b5f4ce4fd..1e3783486 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# r.pkg.template 0.1.0.9167 +# r.pkg.template 0.1.0.9168 ### New features From 226b8977922c50351f937f55ed13f83b67059b55 Mon Sep 17 00:00:00 2001 From: walkowif <59475134+walkowif@users.noreply.github.com> Date: Tue, 25 Jun 2024 15:27:38 +0200 Subject: [PATCH 3/4] Workflow for adding WASM packages to GitHub release (#243) --- .github/workflows/wasm.yaml | 76 +++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 .github/workflows/wasm.yaml diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml new file mode 100644 index 000000000..cab817a82 --- /dev/null +++ b/.github/workflows/wasm.yaml @@ -0,0 +1,76 @@ +--- +name: WASM 🧭 + +on: + workflow_call: + inputs: + package-subdirectory: + description: Subdirectory in the repository, where the R package is located. + required: false + type: string + default: "" + +jobs: + wasm: + name: WASM 🧭 + runs-on: ubuntu-latest + if: startsWith(github.ref, 'refs/tags/v') + steps: + - name: Get branch names 🌿 + id: branch-name + uses: tj-actions/branch-names@v7 + + - name: Checkout repo 🛎 + uses: actions/checkout@v4.1.1 + with: + ref: ${{ steps.branch-name.outputs.head_ref_branch }} + path: ${{ github.event.repository.name }} + + - name: Get package name 📦 + run: | + echo "PKGNAME=$(echo $(awk -F: '/Package:/{gsub(/[ ]+/,"") ; print $2}' DESCRIPTION))" >> $GITHUB_ENV + shell: bash + working-directory: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} + + - name: Build WASM packages 🧭 + uses: r-wasm/actions/build-rwasm@v1 + with: + packages: | + ${{ github.repository_owner }}/${{ env.PKGNAME }}@${{ steps.branch-name.outputs.tag }} + + - name: Upload WASM packages ⬆ + uses: actions/upload-artifact@v4 + with: + name: wasm-${{ env.PKGNAME }} + path: | + _site/bin/emscripten/contrib/*/${{ env.PKGNAME }}*.tgz + _site/src/contrib/${{ env.PKGNAME }}*.tar.gz + + - name: Check if release exists ⚙️ + id: check-if-release-exists + uses: insightsengineering/release-existence-action@v1 + + - name: Download artifact ⏬ + if: >- + steps.check-if-release-exists.outputs.release-exists == 'true' + uses: actions/download-artifact@v4 + with: + name: wasm-${{ env.PKGNAME }} + path: wasm-${{ env.PKGNAME }} + + - name: Prepare WASM release artifact 🗜️ + if: >- + steps.check-if-release-exists.outputs.release-exists == 'true' + run: | + zip -r9 wasm-${{ env.PKGNAME }}.zip wasm-${{ env.PKGNAME }} + + - name: Upload WASM build to release 🔼 + if: >- + steps.check-if-release-exists.outputs.release-exists == 'true' + uses: svenstaro/upload-release-action@v2 + with: + file: ./wasm-${{ env.PKGNAME }}.zip + asset_name: wasm-${{ env.PKGNAME }}.zip + repo_token: ${{ secrets.GITHUB_TOKEN }} + tag: ${{ github.ref }} + overwrite: true From 9993cb31b798cc70eda4442f332031e59bbef6fc Mon Sep 17 00:00:00 2001 From: walkowif Date: Tue, 25 Jun 2024 13:28:30 +0000 Subject: [PATCH 4/4] [skip actions] Bump version to 0.1.0.9169 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 148707ee1..ba5c77688 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: r.pkg.template Title: R Package Template -Version: 0.1.0.9168 +Version: 0.1.0.9169 Date: 2024-06-25 Authors@R: person("insightsengineering", , , "insightsengineering@example.com", role = c("aut", "cre")) diff --git a/NEWS.md b/NEWS.md index 1e3783486..fa5975b23 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# r.pkg.template 0.1.0.9168 +# r.pkg.template 0.1.0.9169 ### New features