Merge ~cjwatson/turnip:publish-swift-build-label into turnip:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 3ad69ed9f339480bd4774ac0764d83bc3423ec8a
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/turnip:publish-swift-build-label
Merge into: turnip:master
Diff against target: 48 lines (+11/-1)
2 files modified
Makefile (+1/-1)
publish-to-swift (+10/-0)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Review via email: mp+387744@code.launchpad.net

Commit message

Publish last-successful-build-label.txt to Swift

Description of the change

This makes it easier for the Mojo spec to find the most recently-built revision, since it can't necessarily enumerate files in the Swift container.

To post a comment you must log in.
Revision history for this message
Ioana Lasc (ilasc) wrote :

nice!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index d10a9b2..7ad822e 100644
--- a/Makefile
+++ b/Makefile
@@ -125,7 +125,7 @@ publish-tarball: build-tarball
125 [ ! -e ~/.config/swift/turnip ] || . ~/.config/swift/turnip; \125 [ ! -e ~/.config/swift/turnip ] || . ~/.config/swift/turnip; \
126 ./publish-to-swift --debug \126 ./publish-to-swift --debug \
127 $(SWIFT_CONTAINER_NAME) $(SWIFT_OBJECT_PATH) \127 $(SWIFT_CONTAINER_NAME) $(SWIFT_OBJECT_PATH) \
128 $(TARBALL_BUILD_PATH)128 $(TARBALL_BUILD_PATH) turnip=$(TARBALL_BUILD_LABEL)
129129
130.PHONY: build check clean dist lint run-api run-pack test130.PHONY: build check clean dist lint run-api run-pack test
131.PHONY: build-tarball publish-tarball131.PHONY: build-tarball publish-tarball
diff --git a/publish-to-swift b/publish-to-swift
index e5cfd59..5a86fe7 100755
--- a/publish-to-swift
+++ b/publish-to-swift
@@ -7,6 +7,7 @@ import os
7import re7import re
8import subprocess8import subprocess
9import sys9import sys
10import tempfile
1011
1112
12def ensure_container_privs(container_name):13def ensure_container_privs(container_name):
@@ -75,6 +76,7 @@ def main():
75 parser.add_argument("container_name")76 parser.add_argument("container_name")
76 parser.add_argument("swift_object_path")77 parser.add_argument("swift_object_path")
77 parser.add_argument("local_path")78 parser.add_argument("local_path")
79 parser.add_argument("build_label")
78 args = parser.parse_args()80 args = parser.parse_args()
7981
80 if args.debug:82 if args.debug:
@@ -118,6 +120,14 @@ def main():
118 args.container_name, args.swift_object_path, args.local_path,120 args.container_name, args.swift_object_path, args.local_path,
119 overwrite=overwrite)121 overwrite=overwrite)
120122
123 with tempfile.TemporaryDirectory() as tmpdir:
124 filename = "last-successful-build-label.txt"
125 with open(os.path.join(tmpdir, filename), "w") as f:
126 f.write(args.build_label)
127 publish_file_to_swift(
128 args.container_name, filename, os.path.join(tmpdir, filename),
129 overwrite=True)
130
121131
122if __name__ == "__main__":132if __name__ == "__main__":
123 main()133 main()

Subscribers

People subscribed via source and target branches