Skip to content

Commit 14ee72e

Browse files
Revert logic related to release remote files (#46)
* Revert logic related to release remote files * Fix
1 parent 2638220 commit 14ee72e

File tree

12 files changed

+17
-114
lines changed

12 files changed

+17
-114
lines changed

.github/workflows/plugin.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
steps:
2929
- name: Checkout code
3030
uses: actions/checkout@v2
31-
- name: Test
32-
run: ./pleasew test //test/release_remote_files:please_pex_remote_hashes
3331
- name: Build
3432
run: ./pleasew build //package:release_files
3533
- name: Release

.plzconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ DefaultValue = python3
2424

2525
[PluginConfig "pex_tool"]
2626
ConfigKey = PexTool
27-
; Release artifact of //tools/please_pex:pex_main.
28-
DefaultValue = //tools:please_pex
27+
DefaultValue = //tools/please_pex:pex_main
2928

3029
[PluginConfig "interpreter_options"]
3130
ConfigKey = InterpreterOptions

BUILD

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
subinclude("//build_defs:version")
22

3+
version(name = "version")
4+
35
filegroup(
46
name = "pleasew",
57
srcs = ["pleasew"],
@@ -8,5 +10,4 @@ filegroup(
810
visibility = ["PUBLIC"],
911
)
1012

11-
version(name = "version")
1213

build_defs/BUILD

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,3 @@ filegroup(
2121
srcs = ["multiversion_wheel.build_defs"],
2222
visibility = ["//third_party/..."],
2323
)
24-
25-
filegroup(
26-
name = "release_file",
27-
srcs = ["release_file.build_defs"],
28-
visibility = ["//package/..."],
29-
)
30-

build_defs/release_file.build_defs

Lines changed: 0 additions & 11 deletions
This file was deleted.

package/BUILD

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
export_file(
2-
name = "files",
3-
src = "files.build_defs",
4-
visibility = ["PUBLIC"],
5-
)
1+
subinclude("//:version", "//build_defs:archs")
2+
3+
release_files = {
4+
"please_pex": "//tools/please_pex:pex_main",
5+
}
66

7-
subinclude(":files", "//build_defs:release_file", "//build_defs:archs")
7+
def release_file(name:str, file_target:str, arch:str):
8+
return genrule(
9+
name = f"{name}_{arch}",
10+
srcs = [f"///{arch}" + canonicalise(file_target)],
11+
outs = [f"{name}-{VERSION}-{arch}"],
12+
cmd = "mv $SRC $OUT",
13+
)
814

915
filegroup(
1016
name = "release_files",
1117
srcs = [
1218
release_file(name, target, arch)
13-
for name, target in RELEASE_FILES.items()
19+
for name, target in release_files.items()
1420
for arch in SUPPORTED_ARCHS
1521
],
1622
labels = ["hlink:plz-out/package"],

package/files.build_defs

Lines changed: 0 additions & 4 deletions
This file was deleted.

test/build_defs/BUILD

Lines changed: 0 additions & 5 deletions
This file was deleted.

test/build_defs/release_remote_file.build_defs

Lines changed: 0 additions & 47 deletions
This file was deleted.

test/release_remote_files/BUILD

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)