[p7zip] Update upstream URL (#6077)

* [p7zip] Update upstream URL [skip ci] [skip build] * [CI] Clearer printing when skipping builds [skip build]
JuliaPackaging · Jan 17, 2023 · 4088daf · 4088daf
1 parent 851b155
commit 4088daf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/.buildkite/generator.jl b/.buildkite/generator.jl
@@ -88,14 +88,6 @@ if isempty(PLATFORMS)
     @error "Unable to determine the proper platforms" NAME
 end
 
-# Create the BUILD_STEPS
-BUILD_STEPS = Any[]
-for PLATFORM in PLATFORMS
-    println("    $(PLATFORM): building")
-
-    push!(BUILD_STEPS, build_step(NAME, PLATFORM, PROJECT))
-end
-
 const IS_PR = get(ENV, "BUILDKITE_PULL_REQUEST", "false") != "false"
 const SKIP_BUILD_COOKIE="[skip build]"
 
@@ -107,9 +99,9 @@ if IS_PR
     PR_NUMBER = ENV["BUILDKITE_PULL_REQUEST"]
     exec(`git fetch origin "refs/pull/$(PR_NUMBER)/head:refs/remotes/origin/pr/$(PR_NUMBER)"`)
 
-    COMMIT_MSG = readchomp(`git show -s --format=%B origin/pr/$(PR_NUMBER)`) 
+    COMMIT_MSG = readchomp(`git show -s --format=%B origin/pr/$(PR_NUMBER)`)
 else
-    COMMIT_MSG = readchomp(`git show -s --format=%B`) 
+    COMMIT_MSG = readchomp(`git show -s --format=%B`)
 end
 # This variable will tell us whether we want to skip the build
 const SKIP_BUILD = contains(COMMIT_MSG, SKIP_BUILD_COOKIE)
@@ -119,7 +111,16 @@ if !IS_PR
     push!(STEPS, jll_init_step(NAME, PROJECT))
     push!(STEPS, wait_step())
 end
-if !SKIP_BUILD
+# Create the BUILD_STEPS
+if SKIP_BUILD
+    println("The commit messages contains $(SKIP_BUILD_COOKIE), skipping build")
+else
+    BUILD_STEPS = Any[]
+    for PLATFORM in PLATFORMS
+        println("    $(PLATFORM): building")
+
+        push!(BUILD_STEPS, build_step(NAME, PLATFORM, PROJECT))
+    end
     push!(STEPS, group_step(NAME, BUILD_STEPS))
 end
 if !IS_PR

diff --git a/.buildkite/pipeline.yml.signature b/.buildkite/pipeline.yml.signature
@@ -1 +1 @@
-Salted__>�o=� T������\1$��P�o�IY�������Sb:p;o��2h���̽l����J�4�9+��#����1
+Salted__wbIwYKp�$����T�@�K+/46�_�$���4ӵ���s��5������#�l#l,����i��v� Ns�\oQ����<�V���� R
diff --git a/P/p7zip/build_tarballs.jl b/P/p7zip/build_tarballs.jl
@@ -1,11 +1,12 @@
 using BinaryBuilder
 
 name = "p7zip"
-version = v"17.04"
+version_string = "17.04"
+version = VersionNumber(version_string)
 
 # Collection of sources required to build p7zip
 sources = [
-    ArchiveSource("https://github.com/jinfeihan57/p7zip/archive/refs/tags/v17.04.tar.gz",
+    ArchiveSource("https://github.com/p7zip-project/p7zip/archive/refs/tags/v$(version_string).tar.gz",
                   "ea029a2e21d2d6ad0a156f6679bd66836204aa78148a4c5e498fe682e77127ef"),
     FileSource("https://downloads.sourceforge.net/project/sevenzip/7-Zip/21.07/7z2107.exe",
                "71e94e6038f4d42ed8f0f38c0e6c3846f21d13527139efa9ef8b8f6312ab6c90"),