<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch travis-ci
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/ce90dcb4f1ccabbe3dfdf519503d9d1d7cb2b836">https://github.com/macports/macports-base/commit/ce90dcb4f1ccabbe3dfdf519503d9d1d7cb2b836</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/travis-ci by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new ce90dcb4 ci: Enable on all branches, add deployment conds
</span>ce90dcb4 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ce90dcb4f1ccabbe3dfdf519503d9d1d7cb2b836
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Wed Dec 9 21:10:17 2020 +0100

<span style='display:block; white-space:pre;color:#404040;'>    ci: Enable on all branches, add deployment conds
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Eventually we want to move off Travis CI, so change GitHub Actions and
</span><span style='display:block; white-space:pre;color:#404040;'>    Azure Pipelines to build on all branches. Guard the two steps required
</span><span style='display:block; white-space:pre;color:#404040;'>    for deployment with conditions to prevent them from running on other
</span><span style='display:block; white-space:pre;color:#404040;'>    branches or in pull requests.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Rename the workflow defintion files, since the previous name
</span><span style='display:block; white-space:pre;color:#404040;'>    'prepare-ci-env.yml' now no longer applies for all non-deployment
</span><span style='display:block; white-space:pre;color:#404040;'>    builds.
</span>---
 .../azure-workflows/{prepare-ci-env.yml => main.yml}   | 18 ++++++++++--------
 .github/workflows/{prepare-ci-env.yml => main.yml}     | 13 ++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/.github/azure-workflows/prepare-ci-env.yml b/.github/azure-workflows/main.yml
</span>similarity index 84%
rename from .github/azure-workflows/prepare-ci-env.yml
rename to .github/azure-workflows/main.yml
<span style='display:block; white-space:pre;color:#808080;'>index 188818d8..a67fca9f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/.github/azure-workflows/prepare-ci-env.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;'>@@ -1,21 +1,21 @@
</span> trigger:
   branches:
     include:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      - travis-ci
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      - *
</span>   tags:
     include:
       - v*
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pr:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  branches:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    - *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> jobs:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  - job: prepare_ports_ci
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    displayName: "Prepare macports-ports CI environment"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  - job: build_and_test_base
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    displayName: "Build & Test MacPorts Base"
</span>     timeoutInMinutes: 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    strategy:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      matrix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        mac-10.14:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-          imageName: 'macOS-10.14'
</span>     pool:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-      vmImage: $(imageName)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+      vmImage: 'macOS-10.14'
</span>     steps:
       - checkout: self
         displayName: "Checkout repository"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,7 @@ jobs:
</span>             --exclude '/opt/local/var/macports/sip-workaround/?*' \
             -cjf "MacPorts.tar.bz2" \
             /opt/local
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        condition: and(succeeded(), or(eq(variables.Build.SourceBranch, 'refs/heads/travis-ci'), startsWith(variables.Build.SourceBranch, 'refs/tags/v')))
</span>         displayName: "Prepare Deployment"
       - bash: |
           set -eu
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,4 +83,5 @@ jobs:
</span>         env:
           user: "macports-ci-env"
           pass: $(BINTRAY_API_TOKEN)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        condition: and(succeeded(), or(eq(variables.Build.SourceBranch, 'refs/heads/travis-ci'), startsWith(variables.Build.SourceBranch, 'refs/tags/v')))
</span>         displayName: "Deploy to bintray"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/.github/workflows/prepare-ci-env.yml b/.github/workflows/main.yml
</span>similarity index 87%
rename from .github/workflows/prepare-ci-env.yml
rename to .github/workflows/main.yml
<span style='display:block; white-space:pre;color:#808080;'>index 0fec8bca..88a0dc8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/.github/workflows/prepare-ci-env.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;'>@@ -1,16 +1,13 @@
</span> ---
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name: "Prepare macports-ports CI environment"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name: "Build & Test MacPorts Base"
</span> 
 on:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  push:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    branches:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      - travis-ci
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    tags:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-      - v*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  - push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  - pull_request
</span> 
 jobs:
   build:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    name: "Prepare macports-ports CI environment"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    name: "Build & Test MacPorts Base"
</span>     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,6 +39,7 @@ jobs:
</span>           set -eu
           make test
       - name: Prepare Deployment
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-ci' || startsWith(github.ref, 'refs/tags/v'))
</span>         run: |
           set -eu
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,6 +56,7 @@ jobs:
</span>             -cjf "MacPorts.tar.bz2" \
             /opt/local
       - name: Deploy to bintray
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        if: github.event_name == 'push' && (github.ref == 'refs/heads/travis-ci' || startsWith(github.ref, 'refs/tags/v'))
</span>         run: |
           set -eu
 
</pre><pre style='margin:0'>

</pre>