Skip to content

Commit

Permalink
use syklib versions
Browse files Browse the repository at this point in the history
  • Loading branch information
thesayyn committed May 16, 2024
1 parent 9509471 commit bdbd11b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 55 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: test

# Controls when the action will run.
on:
Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
bzlmodEnabled: [true, false]
exclude:
# Root module is BZLMOD only, do not test it without bzlmod enabled.
- bzlmodEnable: false
- bzlmodEnabled: false
folder: .

# Steps represent a sequence of tasks that will be executed as part of the job
Expand Down
6 changes: 0 additions & 6 deletions apko/private/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,3 @@ bzl_library(
srcs = ["versions.bzl"],
visibility = ["//apko:__subpackages__"],
)

bzl_library(
name = "bazelversion",
srcs = ["bazelversion.bzl"],
visibility = ["//apko:__subpackages__"],
)
4 changes: 2 additions & 2 deletions apko/private/apk.bzl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"Repository rules for importing remote apk packages"

load(":bazelversion.bzl", "bazel_version_gte")
load("@bazel_skylib//lib:versions.bzl", "versions")
load(":util.bzl", "util")

APK_IMPORT_TMPL = """\
Expand Down Expand Up @@ -43,7 +43,7 @@ To resolve this issue and enable partial package fetching, please follow the ste
""".format(bytes[0]))

def _download(rctx, url, rng, **kwargs):
if bazel_version_gte("7.1.0"):
if versions.is_at_least("7.1.0", native.bazel_version):
return rctx.download(
url = [url],
headers = {"Range": [rng]},
Expand Down
45 changes: 0 additions & 45 deletions apko/private/bazelversion.bzl

This file was deleted.

0 comments on commit bdbd11b

Please sign in to comment.