Skip to content

Commit

Permalink
deps: update dependency ubuntu to v24
Browse files Browse the repository at this point in the history
This requires updating the `free-disk-space` action as the ubuntu-24.04
runners do not have pre-installed Docker images anymore. Also the list
of tools to delete needs to be updated.

The `funTest-non-docker` job now has to use `pipx install` instead of
`pip install` to install ScanCode.
  • Loading branch information
renovate[bot] authored and mnonnenmacher committed Sep 27, 2024
1 parent c180727 commit 90c8fb0
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 44 deletions.
33 changes: 8 additions & 25 deletions .github/actions/free-disk-space/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,34 +16,13 @@
# License-Filename: LICENSE

name: "Free Disk Space"
description: "Remove unneeded preinstalled Docker images and software to free disk space."
description: "Remove unneeded software to free disk space."
author: "The ORT Project Authors"

runs:
using: "composite"

steps:
- name: Print Disk Space
shell: bash
run: df -h
- name: List Docker Images
if: ${{ false }} # Can be enabled if the 'Remove Unneeded Docker Images' step below needs to be updated.
shell: bash
run: docker images
- name: Remove Unneeded Docker Images
shell: bash
run: |
docker image rm \
node:16 \
node:16-alpine \
node:18 \
node:18-alpine \
node:20 \
node:20-alpine \
debian:10 \
debian:11 \
ubuntu:20.04 \
ubuntu:22.04
- name: Print Disk Space
shell: bash
run: df -h
Expand All @@ -59,18 +38,22 @@ runs:
- name: Remove Unneeded Tools
shell: bash
run: |
sudo rm -rf /usr/lib/dotnet
sudo rm -rf /usr/lib/firefox
sudo rm -rf /usr/local/aws-cli
sudo rm -rf /usr/local/aws-sam-cli
sudo rm -rf /usr/local/lib/android
sudo rm -rf /usr/local/lib/node_modules
sudo rm -rf /usr/local/share/chromium
sudo rm -rf /usr/local/share/powershell
sudo rm -rf /usr/share/az_11.3.1
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/share/vcpkg
sudo rm -rf /usr/share/az_12.1.0
sudo rm -rf /usr/share/kotlinc
sudo rm -rf /usr/share/mecab
sudo rm -rf /usr/share/miniconda
sudo rm -rf /usr/share/ri
sudo rm -rf /usr/share/sbt
sudo rm -rf /usr/share/swift
sudo rm -rf /usr/share/vim
- name: Print Disk Space
shell: bash
run: df -h
12 changes: 6 additions & 6 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -25,7 +25,7 @@ jobs:
run: ./gradlew classes
codeql-analysis:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
# Needed for SARIF scanning upload.
security-events: write
Expand All @@ -44,7 +44,7 @@ jobs:
uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3
test:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -64,7 +64,7 @@ jobs:
flags: test
funTest-non-docker:
needs: build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:
# Install ScanCode for license texts.
curl -Os https://raw.githubusercontent.com/nexB/scancode-toolkit/v$SCANCODE_VERSION/requirements.txt
pip install --no-cache-dir --constraint requirements.txt scancode-toolkit==$SCANCODE_VERSION
pipx install --pip-args="--no-cache-dir --constraint requirements.txt" scancode-toolkit==$SCANCODE_VERSION
- name: Setup Gradle
uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4
- name: Run functional tests that do not require external tools
Expand All @@ -112,7 +112,7 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}
flags: funTest-non-docker
funTest-docker:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
jobs:
disk_space:
name: Docker Build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
attestations: write
contents: write
id-token: write
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ env:

jobs:
commit-lint:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -24,7 +24,7 @@ jobs:
with:
configFile: .commitlintrc.yml
code-base-checks:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -33,7 +33,7 @@ jobs:
- name: Check copyrights, license headers, and .gitattributes
run: ./gradlew checkCopyrightsInNoticeFile checkLicenseHeaders checkGitAttributes
completions:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -53,7 +53,7 @@ jobs:
exit 1
fi
detekt-issues:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
# Needed for SARIF scanning upload.
security-events: write
Expand All @@ -70,7 +70,7 @@ jobs:
with:
sarif_file: build/reports/detekt/merged.sarif
markdown-links:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -82,7 +82,7 @@ jobs:
max-depth: 2
use-quiet-mode: yes
markdownlint:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand All @@ -96,7 +96,7 @@ jobs:
npx markdownlint-cli2
qodana-scan:
if: ${{ github.event_name == 'pull_request' }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
# Needed for SARIF scanning upload.
security-events: write
Expand All @@ -115,7 +115,7 @@ jobs:
with:
sarif_file: ${{ runner.temp }}/qodana/results/qodana.sarif.json
reuse-tool:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/website-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
build:
name: Website Build
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
Expand All @@ -34,6 +34,6 @@ jobs:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4
2 changes: 1 addition & 1 deletion .github/workflows/website-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
test:
name: Website Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
Expand Down

0 comments on commit 90c8fb0

Please sign in to comment.