diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4eb5c69..7153eef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,9 +40,9 @@ jobs: id: setup-matrix run: | platforms=$(python test/get_platforms.py ${{ github.event.inputs.platforms }}) - echo "::set-output name=platforms::$platforms" + echo "platforms=$platforms" >> $GITHUB_OUTPUT r_versions=$(python test/get_r_versions.py ${{ github.event.inputs.r_versions }}) - echo "::set-output name=r_versions::$r_versions" + echo "r_versions=$r_versions" >> $GITHUB_OUTPUT docker-images: needs: setup-matrix @@ -60,12 +60,12 @@ jobs: install: true # Enable Docker layer caching without having to push to a registry. - # https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#local-cache + # https://docs.docker.com/build/ci/github-actions/examples/#local-cache # This may eventually be migrated to the GitHub Actions cache backend, # which is still considered experimental. # https://github.com/moby/buildkit#github-actions-cache-experimental - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.buildx-cache key: ${{ matrix.platform }}-buildx-${{ github.sha }} @@ -108,7 +108,7 @@ jobs: install: true - name: Restore cached Docker layers - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /tmp/.buildx-cache key: ${{ matrix.platform }}-buildx-${{ github.sha }} diff --git a/Jenkinsfile b/Jenkinsfile index eeb9dc5..ca3d2a4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { stage('push images') { agent { label 'docker-4x' } when { - branch 'master' + branch 'main' } steps { sh 'make docker-push' @@ -25,7 +25,7 @@ pipeline { stage('deploy') { agent none when { - branch 'master' + branch 'main' } steps { build(job: 'r-builds/deploy-r-builds', wait: true, diff --git a/README.md b/README.md index 9e8bbe0..0751079 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,19 @@ # r-builds This repository orchestrates tools to produce R binaries. The binaries are available as a -community resource, **they are not professionally supported by RStudio**. +community resource, **they are not professionally supported by Posit**. The R language is open source, please see the official documentation at https://www.r-project.org/. These binaries are not a replacement to existing binary distributions for R. The binaries were built with the following considerations: - They use a minimal set of [build and runtime dependencies](builder). -- They are designed to be used side-by-side, e.g., on [RStudio Server Pro](https://docs.rstudio.com/ide/server-pro/r-versions.html#using-multiple-versions-of-r-concurrently). +- They are designed to be used side-by-side, e.g., on [Posit Workbench](https://docs.posit.co/ide/server-pro/r_versions/using_multiple_versions_of_r.html). - They give users a consistent option for accessing R across different Linux distributions. These binaries have been extensively tested, and are used in production everyday -on [RStudio Cloud](https://rstudio.cloud) and +on [Posit Cloud](https://posit.cloud) and [shinyapps.io](https://shinyapps.io). Please open an issue to report a specific -bug, or ask questions on [RStudio Community](https://community.rstudio.com). +bug, or ask questions on [Posit Community](https://community.rstudio.com). ## Supported Platforms @@ -27,7 +27,7 @@ R binaries are built for the following Linux operating systems: - SUSE Linux Enterprise 15 SP3, 15 SP4 Operating systems are supported until their vendor end-of-support dates, which -can be found on the [RStudio Platform Support](https://www.rstudio.com/about/platform-support/) +can be found on the [Posit Platform Support](https://posit.co/about/platform-support/) page. When an operating system has reached its end of support, builds for it will be discontinued, but existing binaries will continue to be available. @@ -46,7 +46,7 @@ bash -c "$(curl -L https://rstd.io/r-install)" ### Specify R version Define the version of R that you want to install. Available versions -of R can be found here: https://cdn.rstudio.com/r/versions.json +of R can be found here: https://cdn.posit.co/r/versions.json ```bash R_VERSION=4.1.3 ``` @@ -57,19 +57,19 @@ R_VERSION=4.1.3 Download the deb package: ```bash # Ubuntu 18.04 -wget https://cdn.rstudio.com/r/ubuntu-1804/pkgs/r-${R_VERSION}_1_amd64.deb +curl -O https://cdn.posit.co/r/ubuntu-1804/pkgs/r-${R_VERSION}_1_amd64.deb # Ubuntu 20.04 -wget https://cdn.rstudio.com/r/ubuntu-2004/pkgs/r-${R_VERSION}_1_amd64.deb +curl -O https://cdn.posit.co/r/ubuntu-2004/pkgs/r-${R_VERSION}_1_amd64.deb # Ubuntu 22.04 -wget https://cdn.rstudio.com/r/ubuntu-2204/pkgs/r-${R_VERSION}_1_amd64.deb +curl -O https://cdn.posit.co/r/ubuntu-2204/pkgs/r-${R_VERSION}_1_amd64.deb # Debian 10 -wget https://cdn.rstudio.com/r/debian-10/pkgs/r-${R_VERSION}_1_amd64.deb +curl -O https://cdn.posit.co/r/debian-10/pkgs/r-${R_VERSION}_1_amd64.deb # Debian 11 -wget https://cdn.rstudio.com/r/debian-11/pkgs/r-${R_VERSION}_1_amd64.deb +curl -O https://cdn.posit.co/r/debian-11/pkgs/r-${R_VERSION}_1_amd64.deb ``` Then install the package: @@ -119,13 +119,13 @@ sudo dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noa Download the rpm package: ```bash # CentOS / RHEL 7 -wget https://cdn.rstudio.com/r/centos-7/pkgs/R-${R_VERSION}-1-1.x86_64.rpm +curl -O https://cdn.posit.co/r/centos-7/pkgs/R-${R_VERSION}-1-1.x86_64.rpm # RHEL 8 / Rocky Linux 8 / AlmaLinux 8 -wget https://cdn.rstudio.com/r/centos-8/pkgs/R-${R_VERSION}-1-1.x86_64.rpm +curl -O https://cdn.posit.co/r/centos-8/pkgs/R-${R_VERSION}-1-1.x86_64.rpm # RHEL 9 / Rocky Linux 9 / AlmaLinux 9 -wget https://cdn.rstudio.com/r/rhel-9/pkgs/R-${R_VERSION}-1-1.x86_64.rpm +curl -O https://cdn.posit.co/r/rhel-9/pkgs/R-${R_VERSION}-1-1.x86_64.rpm ``` Then install the package: @@ -138,10 +138,10 @@ sudo yum install R-${R_VERSION}-1-1.x86_64.rpm Download the rpm package: ```bash # openSUSE 15.3 / SLES 15 SP3 -wget https://cdn.rstudio.com/r/opensuse-153/pkgs/R-${R_VERSION}-1-1.x86_64.rpm +curl -O https://cdn.posit.co/r/opensuse-153/pkgs/R-${R_VERSION}-1-1.x86_64.rpm # openSUSE 15.4 / SLES 15 SP4 -wget https://cdn.rstudio.com/r/opensuse-154/pkgs/R-${R_VERSION}-1-1.x86_64.rpm +curl -O https://cdn.posit.co/r/opensuse-154/pkgs/R-${R_VERSION}-1-1.x86_64.rpm ``` Then install the package: diff --git a/builder/Dockerfile.opensuse-154 b/builder/Dockerfile.opensuse-154 index a3fc669..1271a03 100644 --- a/builder/Dockerfile.opensuse-154 +++ b/builder/Dockerfile.opensuse-154 @@ -94,7 +94,7 @@ ENV CONFIGURE_OPTIONS="\ # but the JDK path is chosen by default. We change this to the JRE path to # support users who only want to install the JRE (non-devel) package. # https://cran.r-project.org/doc/manuals/r-release/R-admin.html#Java-support -# https://solutions.rstudio.com/r/using-rjava/ +# https://solutions.posit.co/envs-pkgs/using-rjava/ ENV JAVA_HOME=/usr/lib64/jvm/jre-11-openjdk COPY package.opensuse-154 /package.sh diff --git a/builder/Dockerfile.rhel-9 b/builder/Dockerfile.rhel-9 index 315836d..b46934a 100644 --- a/builder/Dockerfile.rhel-9 +++ b/builder/Dockerfile.rhel-9 @@ -81,7 +81,7 @@ ENV R_RD4PDF="times,hyper" # requires users to run `R CMD javareconf` even on minor/patch upgrades. Use the # major version symlink to avoid this. # https://cran.r-project.org/doc/manuals/r-release/R-admin.html#Java-support -# https://solutions.rstudio.com/r/using-rjava/ +# https://solutions.posit.co/envs-pkgs/using-rjava/ ENV JAVA_HOME=/usr/lib/jvm/jre-11-openjdk # R 3.x requires PCRE2 for Pango support on RHEL 9 diff --git a/builder/package.centos-7 b/builder/package.centos-7 index e48278a..5777c8d 100644 --- a/builder/package.centos-7 +++ b/builder/package.centos-7 @@ -31,10 +31,10 @@ version: 1 version_schema: none arch: $(cat /tmp/arch) release: 1 -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPLv2+ depends: diff --git a/builder/package.centos-8 b/builder/package.centos-8 index cc8ced9..b8bc195 100644 --- a/builder/package.centos-8 +++ b/builder/package.centos-8 @@ -31,10 +31,10 @@ version: 1 version_schema: none arch: $(cat /tmp/arch) release: 1 -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPLv2+ depends: diff --git a/builder/package.debian-10 b/builder/package.debian-10 index a4266f8..6f4568d 100644 --- a/builder/package.debian-10 +++ b/builder/package.debian-10 @@ -17,10 +17,10 @@ version_schema: none section: gnu-r arch: $(dpkg --print-architecture) priority: optional -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPL-2 deb: diff --git a/builder/package.debian-11 b/builder/package.debian-11 index aec9c45..31fdc08 100644 --- a/builder/package.debian-11 +++ b/builder/package.debian-11 @@ -18,10 +18,10 @@ version_schema: none section: gnu-r arch: $(dpkg --print-architecture) priority: optional -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPL-2 deb: diff --git a/builder/package.opensuse-153 b/builder/package.opensuse-153 index bfb1114..8c9dd82 100644 --- a/builder/package.opensuse-153 +++ b/builder/package.opensuse-153 @@ -31,10 +31,10 @@ version: 1 version_schema: none arch: $(cat /tmp/arch) release: 1 -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPLv2+ depends: diff --git a/builder/package.opensuse-154 b/builder/package.opensuse-154 index 61f8b53..fea6ae8 100644 --- a/builder/package.opensuse-154 +++ b/builder/package.opensuse-154 @@ -47,10 +47,10 @@ version: 1 version_schema: none arch: $(cat /tmp/arch) release: 1 -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPLv2+ depends: diff --git a/builder/package.rhel-9 b/builder/package.rhel-9 index 964fbaa..ee16be6 100644 --- a/builder/package.rhel-9 +++ b/builder/package.rhel-9 @@ -48,10 +48,10 @@ version: 1 version_schema: none arch: $(cat /tmp/arch) release: 1 -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPLv2+ depends: diff --git a/builder/package.ubuntu-1804 b/builder/package.ubuntu-1804 index 6adbda9..3ffbcdd 100644 --- a/builder/package.ubuntu-1804 +++ b/builder/package.ubuntu-1804 @@ -17,10 +17,10 @@ version_schema: none section: universe/math arch: $(dpkg --print-architecture) priority: optional -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPL-2 deb: diff --git a/builder/package.ubuntu-2004 b/builder/package.ubuntu-2004 index 31d2b85..ef771d8 100644 --- a/builder/package.ubuntu-2004 +++ b/builder/package.ubuntu-2004 @@ -17,10 +17,10 @@ version_schema: none section: universe/math priority: optional arch: $(dpkg --print-architecture) -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPL-2 deb: diff --git a/builder/package.ubuntu-2204 b/builder/package.ubuntu-2204 index 7c68c3b..f8f315b 100644 --- a/builder/package.ubuntu-2204 +++ b/builder/package.ubuntu-2204 @@ -18,10 +18,10 @@ version_schema: none section: universe/math priority: optional arch: $(dpkg --print-architecture) -maintainer: RStudio, PBC +maintainer: Posit Software, PBC description: | GNU R statistical computation and graphics system -vendor: RStudio, PBC +vendor: Posit Software, PBC homepage: https://www.r-project.org license: GPL-2 deb: diff --git a/install.sh b/install.sh index 234d75e..b46c812 100755 --- a/install.sh +++ b/install.sh @@ -27,7 +27,7 @@ if [[ $(id -u) != "0" ]]; then fi # The root of the S3 URL for downloads -CDN_URL='https://cdn.rstudio.com/r' +CDN_URL='https://cdn.posit.co/r' # The URL for listing available R versions VERSIONS_URL="${CDN_URL}/versions.json" diff --git a/test/get_r_versions.py b/test/get_r_versions.py index 0a2ebd9..7e7a668 100644 --- a/test/get_r_versions.py +++ b/test/get_r_versions.py @@ -3,7 +3,7 @@ import json import re import urllib.request -VERSIONS_URL = 'https://cdn.rstudio.com/r/versions.json' +VERSIONS_URL = 'https://cdn.posit.co/r/versions.json' # Minimum R version for "all" MIN_ALL_VERSION = '3.1.0'