From f32aed5b9f86c81c754ce308ca287375269da904 Mon Sep 17 00:00:00 2001
From: "Peter A. Jonsson" <jonsson.peter.a@gmail.com>
Date: Wed, 7 Aug 2024 16:49:44 +0200
Subject: [PATCH 1/2] CI: fix trigger paths

This should have been a part of
commit 588649f41.
---
 .github/workflows/lint.yml             | 4 ++--
 .github/workflows/pyspy-profiling.yaml | 4 ++--
 .github/workflows/test-prod.yaml       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2ee1b0d1..eaec62b8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,24 +7,24 @@ on:
       - 'master'
     paths:
       - '**'
-      - '.github/workflows/lint.yml'
       - '!docs/**'
       - '!*.rst'
       - '!*.md'
       - '!datacube_ows/__init__.py'
       - '!.github/**'
+      - '.github/workflows/lint.yml'
 
   push:
     branches:
       - 'master'
     paths:
       - '**'
-      - '.github/workflows/lint.yml'
       - '!docs/**'
       - '!*.rst'
       - '!*.md'
       - '!datacube_ows/__init__.py'
       - '!.github/**'
+      - '.github/workflows/lint.yml'
 
 jobs:
   pylint:
diff --git a/.github/workflows/pyspy-profiling.yaml b/.github/workflows/pyspy-profiling.yaml
index 92ffdd04..8b3033df 100644
--- a/.github/workflows/pyspy-profiling.yaml
+++ b/.github/workflows/pyspy-profiling.yaml
@@ -7,24 +7,24 @@ on:
         - 'master'
     paths:
       - '**'
-      - '.github/workflows/pyspy-profiling.yaml'
       - '!docs/**'
       - '!*.rst'
       - '!*.md'
       - '!datacube_ows/__init__.py'
       - '!.github/**'
+      - '.github/workflows/pyspy-profiling.yaml'
 
   push:
     branches:
       - 'master'
     paths:
       - '**'
-      - '.github/workflows/pyspy-profiling.yaml'
       - '!docs/**'
       - '!*.rst'
       - '!*.md'
       - '!datacube_ows/__init__.py'
       - '!.github/**'
+      - '.github/workflows/pyspy-profiling.yaml'
 
 jobs:
   build:
diff --git a/.github/workflows/test-prod.yaml b/.github/workflows/test-prod.yaml
index 7af740cc..b10b8e20 100644
--- a/.github/workflows/test-prod.yaml
+++ b/.github/workflows/test-prod.yaml
@@ -7,24 +7,24 @@ on:
         - 'master'
     paths:
       - '**'
-      - '.github/workflows/test-prod.yaml'
       - '!docs/**'
       - '!*.rst'
       - '!*.md'
       - '!datacube_ows/__init__.py'
       - '!.github/**'
+      - '.github/workflows/test-prod.yaml'
 
   push:
     branches:
       - 'master'
     paths:
       - '**'
-      - '.github/workflows/test-prod.yaml'
       - '!docs/**'
       - '!*.rst'
       - '!*.md'
       - '!datacube_ows/__init__.py'
       - '!.github/**'
+      - '.github/workflows/test-prod.yaml'
 
 env:
   ORG: opendatacube

From 54b1b606dd4537a923743dc94a23662f181bcc0c Mon Sep 17 00:00:00 2001
From: "Peter A. Jonsson" <jonsson.peter.a@gmail.com>
Date: Wed, 7 Aug 2024 16:43:29 +0200
Subject: [PATCH 2/2] CI: stop using set-output

The set-output command has been
deprecated for a couple of years
by now, switch to using GITHUB_OUTPUT
to reduce the noise in the CI logs.
---
 .github/workflows/pyspy-profiling.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pyspy-profiling.yaml b/.github/workflows/pyspy-profiling.yaml
index 8b3033df..5787de14 100644
--- a/.github/workflows/pyspy-profiling.yaml
+++ b/.github/workflows/pyspy-profiling.yaml
@@ -55,9 +55,9 @@ jobs:
         export LOCAL_UID=$(id -u $USER)
         export LOCAL_GID=$(id -g $USER)
         export $(grep -v '^#' .env_simple | xargs)
-        echo "::set-output name=PID::$(docker inspect --format '{{.State.Pid}}' $(docker inspect -f '{{.Name}}' \
+        echo "PID=$(docker inspect --format '{{.State.Pid}}' $(docker inspect -f '{{.Name}}' \
         $(docker compose -f docker-compose.yaml -f docker-compose.db.yaml -f docker-compose.pyspy.yaml ps -q ows_18) \
-        | cut -c2-))"
+        | cut -c2-))" >> $GITHUB_OUTPUT
 
     - name: Run py-spy profiling (stage 1 - run profiling service)
       timeout-minutes: 1