Skip to content

Commit 4fa95c0

Browse files
committed
update
1 parent 1474a31 commit 4fa95c0

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# This workflow contains a single job called "build"
1717
build:
1818
# The type of runner that the job will run on
19-
runs-on: [ubuntu-24.10-s390x, ubuntu-22.10-ppc64le]
19+
runs-on: [ubuntu-24.10-s390x, ubuntu-22.04-ppc64le]
2020
# Steps represent a sequence of tasks that will be executed as part of the job
2121
steps:
2222
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it

Dockerfile.ubuntu

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
FROM ubuntu:24.10
1+
FROM ubuntu:22.04
22

33
ARG RUNNERREPO="https://github.com/actions/runner" RUNNERPATCH SDK_VERSION ARCH
44

55
ENV DEBIAN_FRONTEND=noninteractive
66

77
RUN apt-get -qq update -y && \
8-
apt-get -qq -y install wget git sudo alien curl dotnet-sdk-8.0 && \
8+
apt-get -qq -y install wget git sudo alien curl && \
99
apt autoclean
1010

11-
RUN dpkg --install /tmp/*.deb && \
12-
rm -rf /tmp/*.deb && \
11+
RUN apt-get -qq -y install dotnet-sdk-8.0 && \
1312
SDK_VERSION=`dotnet --version` && \
1413
echo "Using SDK - ${SDK_VERSION}"
1514

build-files/install-packages.sh

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
#!/bin/bash
22
header() {
3-
echo "+--------------------------------------------+"
4-
echo "| $*"
5-
echo "+--------------------------------------------+"
3+
TS=`date +"%Y-%m-%dT%H:%M:%S%:z"`
4+
echo "${TS} +--------------------------------------------+"
5+
echo "${TS} | $*"
6+
echo "${TS} +--------------------------------------------+"
67
echo
78
}
89

10+
msg() {
11+
echo `date +"%Y-%m-%dT%H:%M:%S%:z"` $*
12+
}
13+
914
# Check if the file name is provided
1015
if [ -z "$1" ]; then
1116
echo "Usage: $0 <package_list.txt>"
@@ -21,7 +26,7 @@ if [ ! -f "$PACKAGE_LIST_FILE" ]; then
2126
fi
2227
header "Installing additional packages"
2328
# Update the package list
24-
echo "Updating package list..."
29+
msg "Updating package list..."
2530
sudo DEBIAN_FRONTEND=noninteractive apt-get -qq update -y
2631

2732
# installing docker
@@ -52,4 +57,4 @@ while IFS= read -r package || [ -n "$package" ]; do
5257
fi
5358
done < "$PACKAGE_LIST_FILE"
5459

55-
echo "All packages from $PACKAGE_LIST_FILE have been installed."
60+
msg "All packages from $PACKAGE_LIST_FILE have been installed."

0 commit comments

Comments
 (0)