From f0dcfe8385dc2bce4254998f5064bbf80a68e5e6 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 09:40:24 -0700 Subject: [PATCH 1/9] Remove ::set-env command --- .github/workflows/check-package-cgmanifest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-package-cgmanifest.yml b/.github/workflows/check-package-cgmanifest.yml index daf48d35205..aef876e548d 100644 --- a/.github/workflows/check-package-cgmanifest.yml +++ b/.github/workflows/check-package-cgmanifest.yml @@ -20,14 +20,14 @@ jobs: if: ${{ github.event_name == 'pull_request' }} run: | git fetch origin ${{ github.base_ref }} - echo "::set-env name=base_sha::$(git rev-parse origin/${{ github.base_ref }})" + echo "base_sha=$(git rev-parse origin/${{ github.base_ref }})" >> $GITHUB_ENV echo "Merging ${{ github.sha }} into ${{ github.base_ref }}" - name: Get base commit for Pushes if: ${{ github.event_name == 'push' }} run: | git fetch origin ${{ github.event.before }} - echo "::set-env name=base_sha::${{ github.event.before }}" + echo "base_sha=${{ github.event.before }}" >> $GITHUB_ENV echo "Merging ${{ github.sha }} into ${{ github.event.before }}" - name: Get the changed files @@ -35,7 +35,7 @@ jobs: echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'" changed_specs=$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }} | { grep "\.spec$" || test $? = 1; }) echo "Files to validate: '${changed_specs}'" - echo "::set-env name=updated-specs::$(echo ${changed_specs})" + echo "updated-specs=$(echo ${changed_specs})" >> $GITHUB_ENV - name: Check each spec run: | From d02f7a920ba66ec292be39e07b6ee77a8f4728a0 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 09:50:06 -0700 Subject: [PATCH 2/9] Test push for check-package-cgmanifest.yml --- SPECS/acl/acl.spec | 1 + SPECS/alsa-lib/alsa-lib.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/SPECS/acl/acl.spec b/SPECS/acl/acl.spec index a8d877805e5..c2dda545ccd 100644 --- a/SPECS/acl/acl.spec +++ b/SPECS/acl/acl.spec @@ -11,6 +11,7 @@ Distribution: Mariner Requires: libacl = %{version}-%{release} BuildRequires: attr-devel + %description This package contains the getfacl and setfacl utilities needed for manipulating access control lists. diff --git a/SPECS/alsa-lib/alsa-lib.spec b/SPECS/alsa-lib/alsa-lib.spec index fb734f4f33a..f2d75274236 100644 --- a/SPECS/alsa-lib/alsa-lib.spec +++ b/SPECS/alsa-lib/alsa-lib.spec @@ -12,6 +12,7 @@ BuildRequires: python2-devel BuildRequires: python2-libs Requires: python2 + %description The ALSA Library package contains the ALSA library used by programs (including ALSA Utilities) requiring access to the ALSA sound interface. From 29208cfe36d99ee8f0b080011db70230e3f40760 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 09:51:17 -0700 Subject: [PATCH 3/9] Revert "Test push for check-package-cgmanifest.yml" This reverts commit d02f7a920ba66ec292be39e07b6ee77a8f4728a0. --- SPECS/acl/acl.spec | 1 - SPECS/alsa-lib/alsa-lib.spec | 1 - 2 files changed, 2 deletions(-) diff --git a/SPECS/acl/acl.spec b/SPECS/acl/acl.spec index c2dda545ccd..a8d877805e5 100644 --- a/SPECS/acl/acl.spec +++ b/SPECS/acl/acl.spec @@ -11,7 +11,6 @@ Distribution: Mariner Requires: libacl = %{version}-%{release} BuildRequires: attr-devel - %description This package contains the getfacl and setfacl utilities needed for manipulating access control lists. diff --git a/SPECS/alsa-lib/alsa-lib.spec b/SPECS/alsa-lib/alsa-lib.spec index f2d75274236..fb734f4f33a 100644 --- a/SPECS/alsa-lib/alsa-lib.spec +++ b/SPECS/alsa-lib/alsa-lib.spec @@ -12,7 +12,6 @@ BuildRequires: python2-devel BuildRequires: python2-libs Requires: python2 - %description The ALSA Library package contains the ALSA library used by programs (including ALSA Utilities) requiring access to the ALSA sound interface. From 12fd6b30d5808835d4f017fdbc7460769fb3d4e1 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 09:52:19 -0700 Subject: [PATCH 4/9] Testing changes for check-package-cgmanifest --- .github/workflows/check-package-cgmanifest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-package-cgmanifest.yml b/.github/workflows/check-package-cgmanifest.yml index aef876e548d..1c328685499 100644 --- a/.github/workflows/check-package-cgmanifest.yml +++ b/.github/workflows/check-package-cgmanifest.yml @@ -2,9 +2,9 @@ name: Check Package CGManifests on: push: - branches: [ main, dev, 1.0* ] + branches: [ main, dev, 1.0*, thcrain/workflow-set-env-fix ] pull_request: - branches: [ main, dev, 1.0* ] + branches: [ main, dev, 1.0*, thcrain/workflow-set-env-fix ] jobs: From 6b6e5cb81933fa6cdddeb560cc7d90aefff7aa1b Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 09:52:51 -0700 Subject: [PATCH 5/9] Test push for check-package-cgmanifest.yml --- SPECS/acl/acl.spec | 1 + SPECS/alsa-lib/alsa-lib.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/SPECS/acl/acl.spec b/SPECS/acl/acl.spec index a8d877805e5..c2dda545ccd 100644 --- a/SPECS/acl/acl.spec +++ b/SPECS/acl/acl.spec @@ -11,6 +11,7 @@ Distribution: Mariner Requires: libacl = %{version}-%{release} BuildRequires: attr-devel + %description This package contains the getfacl and setfacl utilities needed for manipulating access control lists. diff --git a/SPECS/alsa-lib/alsa-lib.spec b/SPECS/alsa-lib/alsa-lib.spec index fb734f4f33a..f2d75274236 100644 --- a/SPECS/alsa-lib/alsa-lib.spec +++ b/SPECS/alsa-lib/alsa-lib.spec @@ -12,6 +12,7 @@ BuildRequires: python2-devel BuildRequires: python2-libs Requires: python2 + %description The ALSA Library package contains the ALSA library used by programs (including ALSA Utilities) requiring access to the ALSA sound interface. From 696c486eca6d097964f7b299ca16671f0c8a94ae Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 09:53:56 -0700 Subject: [PATCH 6/9] Revert "Test push for check-package-cgmanifest.yml" This reverts commit 6b6e5cb81933fa6cdddeb560cc7d90aefff7aa1b. --- SPECS/acl/acl.spec | 1 - SPECS/alsa-lib/alsa-lib.spec | 1 - 2 files changed, 2 deletions(-) diff --git a/SPECS/acl/acl.spec b/SPECS/acl/acl.spec index c2dda545ccd..a8d877805e5 100644 --- a/SPECS/acl/acl.spec +++ b/SPECS/acl/acl.spec @@ -11,7 +11,6 @@ Distribution: Mariner Requires: libacl = %{version}-%{release} BuildRequires: attr-devel - %description This package contains the getfacl and setfacl utilities needed for manipulating access control lists. diff --git a/SPECS/alsa-lib/alsa-lib.spec b/SPECS/alsa-lib/alsa-lib.spec index f2d75274236..fb734f4f33a 100644 --- a/SPECS/alsa-lib/alsa-lib.spec +++ b/SPECS/alsa-lib/alsa-lib.spec @@ -12,7 +12,6 @@ BuildRequires: python2-devel BuildRequires: python2-libs Requires: python2 - %description The ALSA Library package contains the ALSA library used by programs (including ALSA Utilities) requiring access to the ALSA sound interface. From 8b417c36912662c4bb743487f2bc2f3b2752a4e1 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 10:06:59 -0700 Subject: [PATCH 7/9] Revert "Testing changes for check-package-cgmanifest" This reverts commit 12fd6b30d5808835d4f017fdbc7460769fb3d4e1. --- .github/workflows/check-package-cgmanifest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-package-cgmanifest.yml b/.github/workflows/check-package-cgmanifest.yml index 1c328685499..aef876e548d 100644 --- a/.github/workflows/check-package-cgmanifest.yml +++ b/.github/workflows/check-package-cgmanifest.yml @@ -2,9 +2,9 @@ name: Check Package CGManifests on: push: - branches: [ main, dev, 1.0*, thcrain/workflow-set-env-fix ] + branches: [ main, dev, 1.0* ] pull_request: - branches: [ main, dev, 1.0*, thcrain/workflow-set-env-fix ] + branches: [ main, dev, 1.0* ] jobs: From 367083089bb61dc8107258ab8ce89740bf645ddf Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 10:33:59 -0700 Subject: [PATCH 8/9] Test PR functionality --- .github/workflows/check-package-cgmanifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-package-cgmanifest.yml b/.github/workflows/check-package-cgmanifest.yml index aef876e548d..df99d8b36e1 100644 --- a/.github/workflows/check-package-cgmanifest.yml +++ b/.github/workflows/check-package-cgmanifest.yml @@ -4,7 +4,7 @@ on: push: branches: [ main, dev, 1.0* ] pull_request: - branches: [ main, dev, 1.0* ] + branches: [ main, dev, 1.0*, thcrain/wokflow-set-env-fix ] jobs: From 5f5371629fb199c122ae3e8bb7e031c9168f9541 Mon Sep 17 00:00:00 2001 From: Thomas Crain Date: Tue, 6 Oct 2020 10:39:38 -0700 Subject: [PATCH 9/9] Revert "Test PR functionality" This reverts commit 367083089bb61dc8107258ab8ce89740bf645ddf. --- .github/workflows/check-package-cgmanifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-package-cgmanifest.yml b/.github/workflows/check-package-cgmanifest.yml index df99d8b36e1..aef876e548d 100644 --- a/.github/workflows/check-package-cgmanifest.yml +++ b/.github/workflows/check-package-cgmanifest.yml @@ -4,7 +4,7 @@ on: push: branches: [ main, dev, 1.0* ] pull_request: - branches: [ main, dev, 1.0*, thcrain/wokflow-set-env-fix ] + branches: [ main, dev, 1.0* ] jobs: