From 9e47a87ca5b7016d93fe922e682601a29ada67cc Mon Sep 17 00:00:00 2001 From: James Hollway Date: Wed, 4 Sep 2024 14:28:26 +0200 Subject: [PATCH 1/4] Using the revised pushrelease.yaml code from @auzaheta --- .github/workflows/pushrelease.yml | 61 ++++++++++++------------------- DESCRIPTION | 2 +- NEWS.md | 11 +++++- 3 files changed, 34 insertions(+), 40 deletions(-) diff --git a/.github/workflows/pushrelease.yml b/.github/workflows/pushrelease.yml index 0c315a3c..6aefb662 100644 --- a/.github/workflows/pushrelease.yml +++ b/.github/workflows/pushrelease.yml @@ -103,47 +103,32 @@ jobs: - name: Display structure of downloaded files run: ls -R - - name: Rename Mac release - run: mv ./macOS/*.tgz migraph_macOS.tgz - - - name: Upload Mac binary - id: upload-mac - uses: actions/upload-release-asset@v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: migraph_macOS.tgz - asset_name: migraph_macOS.tgz - asset_content_type: application/zip - - - name: Rename Linux release - run: mv ./linuxOS/*.tar.gz migraph_linuxOS.tar.gz - - - name: Upload Linux binary - id: upload-lin - uses: actions/upload-release-asset@v1.0.2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Rename binaries release + shell: bash + run: | + ls -R + cp ./macOS/${{ env.PACKAGE_NAME }}_${{ env.PACKAGE_VERSION }}*.tgz . + cp ./linuxOS/${{ env.PACKAGE_NAME }}_${{ env.PACKAGE_VERSION }}*.tar.gz . + cp ./winOS/${{ env.PACKAGE_NAME }}_${{ env.PACKAGE_VERSION }}*.zip . + echo "Renamed files" + ls migraph_* + + - name: Create Release and Upload Assets + id: create_release + uses: softprops/action-gh-release@v2 with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: migraph_linuxOS.tar.gz - asset_name: migraph_linuxOS.tar.gz - asset_content_type: application/zip - - - name: Rename Windows release - run: mv ./winOS/*.zip migraph_winOS.zip - - - name: Upload Windows binary - id: upload-win - uses: actions/upload-release-asset@v1.0.2 + tag_name: ${{ steps.newtag.outputs.tag }} + name: Release ${{ steps.newtag.outputs.tag }} + draft: false + prerelease: false + fail_on_unmatched_files: true + # Specify the assets you want to upload + files: | + migraph_*.tgz + migraph_*.tar.gz + migraph_*.zip env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps - asset_path: migraph_winOS.zip - asset_name: migraph_winOS.zip - asset_content_type: application/zip pkgdown: name: Build and deploy website diff --git a/DESCRIPTION b/DESCRIPTION index c69fada5..09a4af5d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,7 +21,7 @@ LazyData: true RoxygenNote: 7.3.2 Depends: R (>= 3.6.0), - manynet + manynet (>=1.0.5) Imports: dplyr (>= 1.1.0), future, diff --git a/NEWS.md b/NEWS.md index ec9d97a9..753b76db 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,9 +1,18 @@ -# migraph 1.4.2 +# migraph 1.4.3 2024-09-04 ## Package +- Using different github actions for renaming and releasing binaries (thanks @auzaheta) +- Updated manynet dependence to >=1.0.5 + +# migraph 1.4.2 + +2024-09-03 + +## Package + - Using github actions download artifact v4 to address dependabot security warning ## Models From 863e258ff98dbf0e2de4bea4a1c027925b3a7215 Mon Sep 17 00:00:00 2001 From: Alvaro Uzaheta Date: Wed, 4 Sep 2024 15:26:22 +0200 Subject: [PATCH 2/4] Update prchecks.yml to check also with the R devel version The versions of the GitHub actions are updated. --- .github/workflows/prchecks.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/prchecks.yml b/.github/workflows/prchecks.yml index efb4d08a..00d5841e 100644 --- a/.github/workflows/prchecks.yml +++ b/.github/workflows/prchecks.yml @@ -14,21 +14,23 @@ jobs: fail-fast: false matrix: config: - - {os: macOS-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: macOS} - - {os: windows-latest, r: 'release', artifact_name: '*.zip', asset_name: winOS} - - {os: ubuntu-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: linuxOS} + - {os: macOS-latest, r: 'release'} + - {os: windows-latest, r: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true - RSPM: ${{ matrix.config.rspm }} GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - 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-pandoc@v2 @@ -57,7 +59,7 @@ jobs: shell: Rscript {0} - name: Save binary artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.config.asset_name }} path: build/ From bebd85abd9bbfd1a5dcdad4a7b40b3dc9c0aa1d9 Mon Sep 17 00:00:00 2001 From: James Hollway Date: Wed, 4 Sep 2024 15:40:05 +0200 Subject: [PATCH 3/4] Added space to manynet version dependence --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 09a4af5d..b3f4e70e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -21,7 +21,7 @@ LazyData: true RoxygenNote: 7.3.2 Depends: R (>= 3.6.0), - manynet (>=1.0.5) + manynet (>= 1.0.5) Imports: dplyr (>= 1.1.0), future, From 9ae032052dda33c3e9ecee3ccaa5c06606f7f7dc Mon Sep 17 00:00:00 2001 From: Alvaro Uzaheta Date: Wed, 4 Sep 2024 15:49:13 +0200 Subject: [PATCH 4/4] Update prchecks.yml undo artifact_name removal --- .github/workflows/prchecks.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prchecks.yml b/.github/workflows/prchecks.yml index 00d5841e..a0b9f4aa 100644 --- a/.github/workflows/prchecks.yml +++ b/.github/workflows/prchecks.yml @@ -14,10 +14,10 @@ jobs: fail-fast: false matrix: config: - - {os: macOS-latest, r: 'release'} - - {os: windows-latest, r: 'release'} - - {os: ubuntu-latest, r: 'release'} - - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: macOS-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: macOS} + - {os: windows-latest, r: 'release', artifact_name: '*.zip', asset_name: winOS} + - {os: ubuntu-latest, r: 'release', artifact_name: '*.tar.gz', asset_name: linuxOS} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release', artifact_name: '*.tar.gz', asset_name: linuxOSrelease} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true