From 79a6ba4ca7fb189cab101035cac9ee15a6817010 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 26 Jul 2023 11:01:30 +0100 Subject: [PATCH 1/2] :arrow_up: Update GitHub Actions versions --- .github/workflows/update_package_versions.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update_package_versions.yaml b/.github/workflows/update_package_versions.yaml index 1f901f9855..2a70bf9e64 100644 --- a/.github/workflows/update_package_versions.yaml +++ b/.github/workflows/update_package_versions.yaml @@ -20,10 +20,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: '3.10' @@ -55,7 +55,7 @@ jobs: - name: Create pull request if: ${{ ! env.ACT }} id: pull-request - uses: peter-evans/create-pull-request@dcd5fd746d53dd8de555c0f10bca6c35628be47a # This commit corresponds to tag 3.12.0 + uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # This commit corresponds to tag 5.0.2 with: commit-message: Update SRD package versions committer: GitHub Actions From a02a2b160d5793a432ffd216aaccb73c210c229c Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 26 Jul 2023 11:11:58 +0100 Subject: [PATCH 2/2] :alien: Update RStudio checker to look for focal and jammy as bionic is no longer downloadable --- .github/scripts/update_rstudio.py | 2 +- .../cloud_init/cloud-init-buildimage-ubuntu-1804.mustache.yaml | 2 +- .../cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml | 2 +- .../{deb-rstudio-bionic.version => deb-rstudio-focal.version} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename deployment/secure_research_desktop/packages/{deb-rstudio-bionic.version => deb-rstudio-focal.version} (100%) diff --git a/.github/scripts/update_rstudio.py b/.github/scripts/update_rstudio.py index b5b16da1c0..ee36a35e66 100644 --- a/.github/scripts/update_rstudio.py +++ b/.github/scripts/update_rstudio.py @@ -7,7 +7,7 @@ root = html.fromstring(remote_page.content) short_links = [link for link in root.xpath("//a[contains(text(), '.deb')]/@href") if "debian" not in link] -for ubuntu_version in ["bionic", "jammy"]: +for ubuntu_version in ["focal", "jammy"]: short_link = [link for link in short_links if ubuntu_version in link][0] remote_content = requests.get(short_link, allow_redirects=True) sha256 = hashlib.sha256(remote_content.content).hexdigest() diff --git a/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-1804.mustache.yaml b/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-1804.mustache.yaml index 8f8c911ca2..44e1bb4397 100644 --- a/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-1804.mustache.yaml +++ b/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-1804.mustache.yaml @@ -122,7 +122,7 @@ write_files: - path: "/opt/build/rstudio.debinfo" permissions: "0400" content: | - {{deb-rstudio-bionic.version}} + {{deb-rstudio-focal.version}} - path: "/opt/monitoring/analyse_build.py" permissions: "0755" diff --git a/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml b/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml index 1cf6facce8..5605e07707 100644 --- a/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml +++ b/deployment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml @@ -122,7 +122,7 @@ write_files: - path: "/opt/build/rstudio.debinfo" permissions: "0400" content: | - {{deb-rstudio-bionic.version}} + {{deb-rstudio-focal.version}} - path: "/opt/monitoring/analyse_build.py" permissions: "0755" diff --git a/deployment/secure_research_desktop/packages/deb-rstudio-bionic.version b/deployment/secure_research_desktop/packages/deb-rstudio-focal.version similarity index 100% rename from deployment/secure_research_desktop/packages/deb-rstudio-bionic.version rename to deployment/secure_research_desktop/packages/deb-rstudio-focal.version