From ef87daf5af1de5d0031ad946f20e1601f1fb905e Mon Sep 17 00:00:00 2001
From: Josh Spicer <joshspicer@github.com>
Date: Tue, 16 Aug 2022 17:33:25 -0400
Subject: update `dotnet`/`oryx` features to use recommended install location
 for dotnet6 (#91)

* use default jammy apt feed to mitigate jammy/oryx install issues

* remove old comment

* jammy first tries default apt repo

* refactoring

* glob friendly and tests

* test files

* better greps

* correct path

* DEBIAN_FRONTEND global in oryx install script

* remove set -e from dotnet script to handle errors ourselves
---
 .github/workflows/test-all.yaml       |  2 +-
 .github/workflows/test-pr-temp.yaml   | 15 ---------------
 .github/workflows/test-pr.yaml        |  2 +-
 .github/workflows/test-scenarios.yaml |  2 +-
 4 files changed, 3 insertions(+), 18 deletions(-)
 delete mode 100644 .github/workflows/test-pr-temp.yaml

(limited to '.github/workflows')

diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 49d38d7..f123cd8 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -8,7 +8,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'no-ci') && !contains(github.event.head_commit.message, 'CI ignore')"
+    if: "!contains(github.event.head_commit.message, 'no-ci') && !contains(github.event.head_commit.message, 'CI ignore') && !contains(github.event.head_commit.message, 'Automated documentation update')"
     continue-on-error: true
     strategy:
       matrix:
diff --git a/.github/workflows/test-pr-temp.yaml b/.github/workflows/test-pr-temp.yaml
deleted file mode 100644
index 3f3dbe9..0000000
--- a/.github/workflows/test-pr-temp.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: "test"
-on:
-  pull_request:
-    paths-ignore:
-      - ./**/oryx/**
-      - ./**/java/**
-      - ./**/dotnet/**
-      - ./**/php/**
-      - ./**/node/**
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - run: 'echo "No build required ; Temporary tweak for merging the PRs until branch protection rules are updated"'
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 04108a7..fce27c5 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -5,7 +5,7 @@ on:
 jobs:
   detect-changes:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'no-ci') && !contains(github.event.head_commit.message, 'CI ignore')"
+    if: "!contains(github.event.head_commit.message, 'no-ci') && !contains(github.event.head_commit.message, 'CI ignore') && !contains(github.event.head_commit.message, 'Automated documentation update')"
     outputs:
       features: ${{ steps.filter.outputs.changes }}
     steps:
diff --git a/.github/workflows/test-scenarios.yaml b/.github/workflows/test-scenarios.yaml
index 91fbf50..ba8a6c0 100644
--- a/.github/workflows/test-scenarios.yaml
+++ b/.github/workflows/test-scenarios.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   scenarios:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, 'no-ci') && !contains(github.event.head_commit.message, 'CI ignore')"
+    if: "!contains(github.event.head_commit.message, 'no-ci') && !contains(github.event.head_commit.message, 'CI ignore') && !contains(github.event.head_commit.message, 'Automated documentation update')"
     steps:
       - uses: actions/checkout@v2
 
-- 
cgit v1.2.3