You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2021/03/31 10:40:21 UTC

[qpid-dispatch] branch main updated: NO-JIRA: update CI job configs to reflect branch names changing to main

This is an automated email from the ASF dual-hosted git repository.

robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/main by this push:
     new a0dff49  NO-JIRA: update CI job configs to reflect branch names changing to main
a0dff49 is described below

commit a0dff49dfd23bf874957c24e9478375d7dc92402
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Mar 31 11:39:31 2021 +0100

    NO-JIRA: update CI job configs to reflect branch names changing to main
---
 .github/workflows/build.yaml | 2 +-
 .travis.yml                  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 228c365..26cbfe3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           repository: 'apache/qpid-proton'
-          ref: 'master'
+          ref: 'main'
           path: 'qpid-proton'
 
       - uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index af38717..00c46cc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ jobs:
   - name: "qdrouterd:Debug (gcc on xenial)"
     os: linux
     env:
-    - PATH="/usr/bin:$PATH" PROTON_VERSION=master BUILD_TYPE=Debug
+    - PATH="/usr/bin:$PATH" PROTON_VERSION=main BUILD_TYPE=Debug
     - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan'
   - name: "qdrouterd:Coverage"
     os: linux
@@ -78,7 +78,7 @@ jobs:
     env:
     - CC=clang-11
     - CXX=clang++-11
-    - PATH="/usr/bin:$PATH" PROTON_VERSION=master BUILD_TYPE=RelWithDebInfo
+    - PATH="/usr/bin:$PATH" PROTON_VERSION=main BUILD_TYPE=RelWithDebInfo
     - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG'
   - name: "qdrouterd:RelWithDebInfo+MemoryDebug (clang on focal)"
     arch: arm64
@@ -105,7 +105,7 @@ jobs:
     env:
       - CC=clang-11
       - CXX=clang++-11
-      - PROTON_VERSION=master BUILD_TYPE=RelWithDebInfo
+      - PROTON_VERSION=main BUILD_TYPE=RelWithDebInfo
       - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG -DQD_ENABLE_ASSERTIONS=ON -DDISPATCH_TEST_TIMEOUT=500'
   - name: "qdrouterd:Default Build"
     os: linux
@@ -132,7 +132,7 @@ jobs:
     os: osx
     osx_image: xcode11
     env:
-    - PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:$PATH" PROTON_VERSION=master
+    - PATH="/opt/local/bin:/opt/local/sbin:/usr/local/bin:$PATH" PROTON_VERSION=main
     - DISPATCH_CMAKE_ARGS='-DRUNTIME_CHECK=asan -DCMAKE_C_FLAGS=-DQD_MEMORY_DEBUG -DQD_ENABLE_ASSERTIONS=ON -DDISPATCH_TEST_TIMEOUT=500'
     # exclude tests that require raw_connection functionality; not available in libuv proactor
     - DISPATCH_CTEST_EXTRA='-E system_tests_tcp_adaptor|system_tests_http1_adaptor|system_tests_http2|system_tests_grpc'

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org