Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update images to Ubuntu 24.04 #124

Merged
merged 10 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/packer-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ jobs:
fail-fast: false
matrix:
template:
- images/ubuntu/templates/ubuntu-22.04.pkr.hcl
- images/ubuntu/templates/ubuntu-22.04.arm64.pkr.hcl
- images/ubuntu/templates/ubuntu-24.04.pkr.hcl
- images/ubuntu/templates/ubuntu-24.04.arm64.pkr.hcl

steps:
- name: Checkout repository
Expand Down Expand Up @@ -183,15 +183,14 @@ jobs:
- name: Preapre artifacts
id: artifacts
run: |
git add -N .
mkdir -p artifacts
name=$(basename -s .pkr.hcl ${{ matrix.template }})
readme=$(git diff --name-only -- '*.md')
mv "$readme" artifacts/readme-${name}.md
readme=$(git ls-files --others --exclude-standard -- '**/software-report.md')
mv "$readme" artifacts/${name}-software-report.md
report=$(git ls-files --others --exclude-standard -- '**/software-report.json')
mv "$report" artifacts/software-report-${name}.json
mv "$report" artifacts/${name}-software-report.json
manifest=$(git ls-files --others --exclude-standard -- '**/build-manifest.json')
mv "$manifest" artifacts/build-manifest-${name}.json
mv "$manifest" artifacts/${name}-build-manifest.json
echo "name=$name" >> "${GITHUB_OUTPUT}"

- name: Upload artifacts
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tag-build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ on:

jobs:
build-and-publish:
uses: grafana/runner-images/.github/workflows/packer-build-and-publish.yml@main
# TODO: Revert back to @main before the PR is merged
uses: grafana/runner-images/.github/workflows/packer-build-and-publish.yml@gc/update-to-ubuntu-24

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be changed back to main?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup! Sorry didn't get back to this PR but it's pending changes from #125 should only be merged after that one is done :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a TODO comment.

350 changes: 0 additions & 350 deletions images/ubuntu/Ubuntu2204-arm64-Readme.md

This file was deleted.

Loading