<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/f316ed64435b33272abc66db0adace0532b7dffc">https://github.com/macports/macports-base/commit/f316ed64435b33272abc66db0adace0532b7dffc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f316ed64 remove bintray deployment from workflows
</span>f316ed64 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f316ed64435b33272abc66db0adace0532b7dffc
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jun 30 23:04:40 2021 +1000
<span style='display:block; white-space:pre;color:#404040;'> remove bintray deployment from workflows
</span>---
.github/azure-workflows/main.yml | 45 --------------------------------------
.github/workflows/main.yml | 47 +---------------------------------------
2 files changed, 1 insertion(+), 91 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/.github/azure-workflows/main.yml b/.github/azure-workflows/main.yml
</span><span style='display:block; white-space:pre;color:#808080;'>index a8538a45..5327c921 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/.github/azure-workflows/main.yml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/.github/azure-workflows/main.yml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,48 +39,3 @@ jobs:
</span> set -eu
make test
displayName: "Test MacPorts Base"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- - bash: |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -eu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -i "" "s/-v selfupdate/version/" portmgr/dmg/postflight
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo install -d -m755 /opt/local/libexec/macports/postflight
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo install -m755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- portmgr/dmg/postflight \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /opt/local/libexec/macports/postflight/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo install -m644 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/*.tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /opt/local/libexec/macports/postflight/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --exclude '/opt/local/var/macports/sip-workaround/?*' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -cjf "MacPorts.tar.bz2" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/travis-ci'), startsWith(variables['Build.SourceBranch'], 'refs/tags/v')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayName: "Prepare Deployment"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - bash: |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -eu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # printf is a built-in, so this won't show up in ps(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "machine api.bintray.com\n\tlogin %s\n\tpassword %s\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$user" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$pass" > ~/.netrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod 600 ~/.netrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os_major=$(uname -r | cut -f 1 -d .)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports_version=$(cat config/macports_version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256=$(openssl dgst -sha256 -binary "MacPorts.tar.bz2" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | xxd -ps -c256)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --upload-file "MacPorts.tar.bz2" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --netrc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Checksum-Sha2: ${sha256}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Package: MacPorts" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Version: ${macports_version}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Publish: 1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Override: 1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "https://api.bintray.com/content/macports-ci-env/macports-base/MacPorts-${os_major}.tar.bz2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user: "macports-ci-env"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass: $(BINTRAY_API_TOKEN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/travis-ci'), startsWith(variables['Build.SourceBranch'], 'refs/tags/v')))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayName: "Deploy to bintray"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
</span><span style='display:block; white-space:pre;color:#808080;'>index fe7dce1e..c595075e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/.github/workflows/main.yml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/.github/workflows/main.yml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ jobs:
</span> runs-on: ${{ matrix.os }}
strategy:
matrix:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- os: [macos-10.15, macos-11.0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ os: [macos-10.15, macos-11]
</span>
steps:
- name: Checkout repository
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,48 +38,3 @@ jobs:
</span> run: |
set -eu
make test
<span style='display:block; white-space:pre;background:#ffe0e0;'>- - name: Prepare Deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-ci' || startsWith(github.ref, 'refs/tags/v'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run: |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -eu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sed -i "" "s/-v selfupdate/version/" portmgr/dmg/postflight
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo install -d -m755 /opt/local/libexec/macports/postflight
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo install -m755 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- portmgr/dmg/postflight \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /opt/local/libexec/macports/postflight/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo install -m644 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/*.tcl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /opt/local/libexec/macports/postflight/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- tar \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --exclude '/opt/local/var/macports/sip-workaround/?*' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -cjf "MacPorts.tar.bz2" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- - name: Deploy to bintray
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-ci' || startsWith(github.ref, 'refs/tags/v'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- run: |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set -eu
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # printf is a built-in, so this won't show up in ps(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "machine api.bintray.com\n\tlogin %s\n\tpassword %s\n" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$user" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "$pass" > ~/.netrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod 600 ~/.netrc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os_major=$(uname -r | cut -f 1 -d .)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports_version=$(cat config/macports_version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256=$(openssl dgst -sha256 -binary "MacPorts.tar.bz2" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- | xxd -ps -c256)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --upload-file "MacPorts.tar.bz2" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --netrc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Checksum-Sha2: ${sha256}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Package: MacPorts" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Version: ${macports_version}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Publish: 1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --header "X-Bintray-Override: 1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "https://api.bintray.com/content/macports-ci-env/macports-base/MacPorts-${os_major}.tar.bz2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user: "macports-ci-env"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass: ${{ secrets.BINTRAY_API_TOKEN }}
</span></pre><pre style='margin:0'>
</pre>