Skip to content

Commit 9a8f8f2

Browse files
committed
Update for product id
1 parent dafd8b8 commit 9a8f8f2

File tree

6 files changed

+27
-20
lines changed

6 files changed

+27
-20
lines changed

.bazeliskrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
USE_BAZEL_VERSION=6.x

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: Release
2+
#on:
3+
# release:
4+
# types: [published]
25
on:
3-
release:
4-
types: [published]
6+
- workflow_dispatch
57

68
jobs:
79
deploy:

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.3
1+
0.1.4

WORKSPACE

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,66 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
44

55
http_archive(
66
name = "io_bazel_rules_kotlin",
7-
urls = ["https://github.com/vaticle/rules_kotlin/archive/c2519b00299cff9df22267e8359784e9948dba67.zip"],
8-
type = "zip",
9-
strip_prefix = "rules_kotlin-c2519b00299cff9df22267e8359784e9948dba67",
107
sha256 = "1455f2ec4bf7ea12d2c90b0dfd6402553c3bb6cbc0271023e2e01ccdefb4a49a",
8+
strip_prefix = "rules_kotlin-c2519b00299cff9df22267e8359784e9948dba67",
9+
type = "zip",
10+
urls = ["https://github.com/vaticle/rules_kotlin/archive/c2519b00299cff9df22267e8359784e9948dba67.zip"],
1111
)
1212

1313
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
14+
1415
kotlin_repositories()
16+
1517
kt_register_toolchains()
1618

1719
http_archive(
1820
name = "rules_jvm_external",
19-
strip_prefix = "rules_jvm_external-3.2",
2021
sha256 = "82262ff4223c5fda6fb7ff8bd63db8131b51b413d26eb49e3131037e79e324af",
22+
strip_prefix = "rules_jvm_external-3.2",
2123
url = "https://github.com/bazelbuild/rules_jvm_external/archive/3.2.zip",
2224
)
2325

2426
http_archive(
2527
name = "bazeldist",
26-
url = "https://maven.jtrim777.dev/releases/dev/jtrim777/bazeldist/0.1.2/bazeldist-all.tar.gz",
27-
sha256 = "d203f17ef5af56af17468cbe7930ba2d49ad6a98e4438c9742488b5273b6fbc6",
28+
sha256 = "721a473c4ae027bcf08ffc2f5b9c19fe08f25eaf8c28a13804cb904f93161092",
29+
url = "https://github.com/jtrim777-dev/bazeldist/releases/download/v0.1.7/bazeldist-all.tar.gz",
2830
)
2931

3032
load("@bazeldist//maven:deps.bzl", "maven_artifacts_with_versions")
3133
load("@rules_jvm_external//:defs.bzl", "maven_install")
34+
3235
maven_install(
3336
artifacts = maven_artifacts_with_versions,
37+
fetch_sources = True,
3438
repositories = [
3539
"https://repo1.maven.org/maven2",
3640
],
3741
strict_visibility = True,
3842
version_conflict_policy = "pinned",
39-
fetch_sources = True,
4043
)
4144

4245
git_repository(
4346
name = "rules_python",
47+
patch_args = ["-p1"],
4448
remote = "https://github.com/bazelbuild/rules_python.git",
4549
tag = "0.1.0",
46-
patch_args = ["-p1"],
4750
)
4851

4952
http_archive(
5053
name = "rules_pkg",
54+
patch_args = ["-p1"],
55+
patches = [
56+
"@bazeldist//:bazelbuild_rules_pkg-allow-long-filenames.patch",
57+
],
58+
sha256 = "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
5159
urls = [
5260
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
5361
"https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
5462
],
55-
sha256 = "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
56-
patches = [
57-
"@bazeldist//:bazelbuild_rules_pkg-allow-long-filenames.patch",
58-
],
59-
patch_args = ["-p1"],
6063
)
6164

6265
load("@bazeldist//common:rules.bzl", "workspace_refs")
66+
6367
workspace_refs(
64-
name = "repo_workspace_refs"
68+
name = "repo_workspace_refs",
6569
)

lsusb-tree.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class LsusbTree < Formula
33

44
desc "A macOS utility for viewing attached USB devices"
55
homepage "https://github.com/jtrim777-dev/lsusb"
6-
url "https://maven.jtrim777.dev/releases/dev/jtrim777/lsusb/{version}/lsusb-pkg.tgz"
6+
url "https://github.com/jtrim777-dev/bazeldist/releases/download/v{version}/lsusb-pkg.tgz"
77
version "{version}"
88
sha256 "{sha256}"
99
license "MIT"

package/bin/lsusb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,9 @@ class USBItem:
157157

158158
name = item['_name'].strip()
159159

160-
if kind != 'port':
160+
if kind == 'node':
161161
vendor = item['vendor_id'].split(' ')[0]
162-
product = item['product_id']
162+
product = item['product_id'] if 'product_id' in item else ""
163163
serial = item['serial_num'] if 'serial_num' in item else ""
164164
else:
165165
vendor = ""

0 commit comments

Comments
 (0)