Merge pull request #1523 from alan-turing-institute/fix-update-packag…

…e-versions Fix update package versions
alan-turing-institute · Jul 26, 2023 · 223a027 · 223a027
2 parents b13e485 + a02a2b1
commit 223a027
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git 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/.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 <[email protected]>

diff --git a/...oyment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-1804.mustache.yaml b/...oyment/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/...oyment/secure_research_desktop/cloud_init/cloud-init-buildimage-ubuntu-2004.mustache.yaml b/...oyment/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/...sktop/packages/deb-rstudio-bionic.version → ...esktop/packages/deb-rstudio-focal.version b/...sktop/packages/deb-rstudio-bionic.version → ...esktop/packages/deb-rstudio-focal.version