Re-enable uploads to our testing S3 bucket on PRs (#367)

* Re-enable uploads to our testing S3 bucket on PRs

The `julia-buildkite` repo should continue to exercise upload codepaths
just like a `master` build of the actual `julia` repository.

* Move special renaming logic inside of conditional

We were accidentally uploading some PRs as nightlies here

* sign treehashes

Author: staticfloat

pipelines/main/launch_signed_jobs.yml.signature

@@ -1 +1 @@
-Salted__�@E0���P)��z2I��c�E����L���dY��Hn��A��\Y����"AtKsUL��3-�f����H�7�OA̒�Œ.�ʾ��O
+Salted__�g�\�</�~2
8���1Z��{��/�����;��;c���|v���s����C�N�L����#��C�����i"'�������

pipelines/main/launch_upload_jobs.yml.signature

@@ -1,2 +1 @@
-Salted__^���l�9�R+]b��|u�v��o5�o=���������@v����A�&~�tI�o���v�Ɨ�.A����-S=��-�m
-�=;�d�
+Salted__����F��Ok9��LD��Y��ݸu�w5j�e�B�_���RaR�ъ"[�}0�&��筐UXM�4TQ��=��+�Ԩ�2�_S��i����=

pipelines/scheduled/coverage/coverage.yml.signature

@@ -1 +1,3 @@
-Salted__Z5uI/c����u����d�*�)y��l���B[/�R�w�M�m��e_p׵z%^D��4o��
�
�=U-��'��t�P�4�B�
+Salted__�u���J�Ŗ��űc��	_
�A
+���W�ɱ+������M�
+��5��ʉxm��̏=��bp�@�ܟR�ߌ)��_d�NݖP���>S�

pipelines/scheduled/launch_signed_jobs.yml.signature

@@ -140,7 +140,7 @@ S3_BUCKET_PREFIX="${S3_BUCKET_PREFIX:-bin}"
 # We generally upload to multiple upload targets
 UPLOAD_TARGETS=()
 
-if [[ "${BUILDKITE_BRANCH}" == master ]] || [[ "${BUILDKITE_BRANCH}" == release-* ]] || [[ "${BUILDKITE_TAG:-}" == v* ]]; then
+if [[ "${BUILDKITE_BRANCH}" == master ]] || [[ "${BUILDKITE_BRANCH}" == release-* ]] || [[ "${BUILDKITE_TAG:-}" == v* ]] || [[ "${BUILDKITE_PIPELINE_SLUG}" == "julia-buildkite" ]]; then
     # First, we have the canonical fully-specified upload target
     UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${OS?}/${ARCH?}/${MAJMIN?}/julia-${TAR_VERSION?}-${OS?}-${ARCH?}" )
 
@@ -171,51 +171,50 @@ if [[ "${BUILDKITE_BRANCH}" == master ]] || [[ "${BUILDKITE_BRANCH}" == release-
             UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${OS?}/x86/julia-latest-${OS?}32" )
         fi
     fi
-fi
-
-# If we're a pull request build, upload to a special `-prXXXX` location
-if [[ "${BUILDKITE_PULL_REQUEST}" != "false" ]]; then
-    UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${OS?}/${ARCH?}/julia-pr${BUILDKITE_PULL_REQUEST}-${OS?}-${ARCH?}" )
-fi
 
+    # We used to name our darwin builds as `julia-*-mac64.tar.gz`, instead of `julia-*-macos-x86_64.tar.gz`.
+    # Let's copy things over to the `mac` OS name for backwards compatibility:
+    if [[ "${OS?}" == "macos" ]] || [[ "${OS?}" == "windows" ]]; then
+        if [[ "${OS?}" == "macos" ]]; then
+            FOLDER_OS="mac"
+            SHORT_OS="mac"
+        elif [[ "${OS?}" == "windows" ]]; then
+            FOLDER_OS="winnt"
+            SHORT_OS="win"
+        else
+            FOLDER_OS="${OS}"
+            SHORT_OS="${OS}"
+        fi
 
-# We used to name our darwin builds as `julia-*-mac64.tar.gz`, instead of `julia-*-macos-x86_64.tar.gz`.
-# Let's copy things over to the `mac` OS name for backwards compatibility:
-if [[ "${OS?}" == "macos" ]] || [[ "${OS?}" == "windows" ]]; then
-    if [[ "${OS?}" == "macos" ]]; then
-        FOLDER_OS="mac"
-        SHORT_OS="mac"
-    elif [[ "${OS?}" == "windows" ]]; then
-        FOLDER_OS="winnt"
-        SHORT_OS="win"
-    else
-        FOLDER_OS="${OS}"
-        SHORT_OS="${OS}"
-    fi
-
-    if [[ "${ARCH}" == "x86_64" ]]; then
-        FOLDER_ARCH="x64"
-        SHORT_ARCH="64"
-    elif [[ "${ARCH}" == "i686" ]]; then
-        FOLDER_ARCH="x86"
-        SHORT_ARCH="32"
-    else
-        FOLDER_ARCH="${ARCH}"
-        SHORT_ARCH="${ARCH}"
-    fi
+        if [[ "${ARCH}" == "x86_64" ]]; then
+            FOLDER_ARCH="x64"
+            SHORT_ARCH="64"
+        elif [[ "${ARCH}" == "i686" ]]; then
+            FOLDER_ARCH="x86"
+            SHORT_ARCH="32"
+        else
+            FOLDER_ARCH="${ARCH}"
+            SHORT_ARCH="${ARCH}"
+        fi
 
-    # First, we have the canonical fully-specified upload target
-    UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${FOLDER_OS}/${FOLDER_ARCH}/${MAJMIN?}/julia-${TAR_VERSION?}-${SHORT_OS}${SHORT_ARCH}" )
+        # First, we have the canonical fully-specified upload target
+        UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${FOLDER_OS}/${FOLDER_ARCH}/${MAJMIN?}/julia-${TAR_VERSION?}-${SHORT_OS}${SHORT_ARCH}" )
 
-    # Next, we have the "majmin/latest" upload target
-    UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${FOLDER_OS}/${FOLDER_ARCH}/${MAJMIN?}/julia-latest-${SHORT_OS}${SHORT_ARCH}" )
+        # Next, we have the "majmin/latest" upload target
+        UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${FOLDER_OS}/${FOLDER_ARCH}/${MAJMIN?}/julia-latest-${SHORT_OS}${SHORT_ARCH}" )
 
-    # If we're on `master` and we're uploading, we consider ourselves "absolute latest"
-    if [[ "${BUILDKITE_BRANCH}" == "master" ]]; then
-        UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${FOLDER_OS}/${FOLDER_ARCH}/julia-latest-${SHORT_OS}${SHORT_ARCH}" )
+        # If we're on `master` and we're uploading, we consider ourselves "absolute latest"
+        if [[ "${BUILDKITE_BRANCH}" == "master" ]]; then
+            UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${FOLDER_OS}/${FOLDER_ARCH}/julia-latest-${SHORT_OS}${SHORT_ARCH}" )
+        fi
     fi
 fi
 
+# If we're a pull request build, upload to a special `-prXXXX` location
+if [[ "${BUILDKITE_PULL_REQUEST}" != "false" ]]; then
+    UPLOAD_TARGETS+=( "${S3_BUCKET}/${S3_BUCKET_PREFIX}/${OS?}/${ARCH?}/julia-pr${BUILDKITE_PULL_REQUEST}-${OS?}-${ARCH?}" )
+fi
+
 # This is the "main" filename that is used.  We technically don't need this for uploading,
 # but it's very convenient for shuttling binaries between buildkite steps.
 export UPLOAD_FILENAME="julia-${TAR_VERSION?}-${OS?}-${ARCH?}"