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.

Sign up for GitHub

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

Jump to bottom

update(driverkit): bump driverkit to 0.14.0 #2012

Merged
merged 2 commits into from
Aug 3, 2023
Merged

update(driverkit): bump driverkit to 0.14.0 #2012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfb1082
udpate(ci): bump driverkit to 0.14.0
therealbobo Aug 3, 2023
44dc437
update(scripts/driverkit): removed legacy code
therealbobo Aug 3, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/build-drivers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
env:
S3_BUCKET: download.draios.com
S3_PREFIX: scap-drivers
DRIVERKIT_VERSION: 0.13.1
DRIVERKIT_VERSION: 0.14.0

# These permissions are needed to interact with GitHub's OIDC Token endpoint.
permissions:
Expand Down
24 changes: 1 addition & 23 deletions scripts/driverkit/utils/generate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,30 +143,8 @@ arch_to_driverkit_arch() {
esac
}

# If driver version is a semver, we are in the newest case
# thus we must support %arch/ subfolder for configs.
# Else, we are in the old case, and we only support x86_64 configs
# in the TARGET_VERSION folder.
# TODO: rm this once old format support is dropped, and always use ${TARGET_VERSION}/${TARGET_ARCH}
function path_from_version() {
SEMVER_REGEX="^(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)\\.(0|[1-9][0-9]*)(\\-[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?(\\+[0-9A-Za-z-]+(\\.[0-9A-Za-z-]+)*)?$"
if [[ $TARGET_VERSION =~ $SEMVER_REGEX ]]; then
# valid semver
echo -n "${TARGET_VERSION}/${TARGET_ARCH}"
elif [[ $TARGET_ARCH == "aarch64" ]]; then
# not valid (old versions) -> skip arm64
echo "Skipping arm64 configs for old tree."
exit 1
else
# not valid (old versions)
echo -n "${TARGET_VERSION}"
fi
}

generate_yamls() {
# TODO: remove once we only support new tree. It is not an error, as we are skipping
# arm64 configs for old tree.
SUBPATH=$(path_from_version) || exit 0
SUBPATH="${TARGET_VERSION}/${TARGET_ARCH}"
# This is an error: wrong arch passed to make generate
DKARCH=$(arch_to_driverkit_arch ${TARGET_ARCH}) || exit 1
FOLDER="${CURRENT_DIR}/../driverkit/config/${SUBPATH}"
Expand Down
Loading