From 04b2461167744604c91ebcea062da4d18e0b873a Mon Sep 17 00:00:00 2001
From: Mathieu Hofman <mathieu@agoric.com>
Date: Thu, 21 Sep 2023 01:00:53 +0000
Subject: [PATCH] ci: jobs compatibility with release branch

---
 .github/workflows/after-merge.yml     | 3 ++-
 .github/workflows/deployment-test.yml | 2 +-
 .github/workflows/docker.yml          | 2 +-
 .github/workflows/golangci-lint.yml   | 2 +-
 .github/workflows/integration.yml     | 7 ++++++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/after-merge.yml b/.github/workflows/after-merge.yml
index 31c8ef4d31a0..80183f34696a 100644
--- a/.github/workflows/after-merge.yml
+++ b/.github/workflows/after-merge.yml
@@ -6,7 +6,8 @@ on:
     branches:
       # $default-branch
       - master
-      - release-pismo
+      - 'release-*'
+  workflow_dispatch:
 
 jobs:
   build:
diff --git a/.github/workflows/deployment-test.yml b/.github/workflows/deployment-test.yml
index c32253ee49e2..5f97ecfa0198 100644
--- a/.github/workflows/deployment-test.yml
+++ b/.github/workflows/deployment-test.yml
@@ -7,7 +7,7 @@ on:
   push:
     branches:
       - master
-      - release-pismo
+      - 'release-*'
       - beta
     tags:
       - '@agoric/sdk@*'
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d5c4cc2aa3ee..91dd21bccb7c 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -5,7 +5,7 @@ on:
     branches:
       # $default-branch
       - master
-      - release-pismo
+      - 'release-*'
     tags:
       - '@agoric/sdk@*'
   workflow_dispatch:
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 7d1e387affe9..993e5bb4f7a7 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -6,7 +6,7 @@ on:
     branches:
       # $default-branch
       - master
-      - release-pismo
+      - 'release-*'
   pull_request:
   merge_group:
 permissions:
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index b765a136ec43..c8e00fc8e6eb 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -5,8 +5,10 @@ on:
   push:
     branches:
       - master
-      - release-pismo
+      - 'release-*'
       - beta
+    tags:
+      - '@agoric/sdk@*'
   pull_request:
     types:
       - opened
@@ -28,6 +30,7 @@ jobs:
     if: needs.pre_check.outputs.should_run == 'true'
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         cli: [link-cli/yarn, registry/yarn, registry/npm, registry/npx]
     timeout-minutes: 40
@@ -76,6 +79,8 @@ jobs:
 
       - name: run agoric-cli integration-test
         run: scripts/registry.sh test ${{ matrix.cli }} ${{steps.get-branch.outputs.result}}
+        # The Endo version used by this release is incompatible with NPM
+        continue-on-error: ${{ startsWith(matrix.cli, 'registry/np') }}
 
       - name: notify on failure
         if: >