Skip to contentSkip to conversation

gitlab-ci: Fix the change rules after moving the YML files

PATCH In review Thomas Huth 4 participants 4 messages Jun 25, 2020 – Jun 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gitlab-ci: Fix the change rules after moving the YML files

The edk2.yml and opensbi.yml files have recently been moved/renamed, but the change has not been reflected in the rules in the YML files yet.

Fixes 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")
---
 .gitlab-ci.d/edk2.yml    | 2 +-
 .gitlab-ci.d/opensbi.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
.gitlab-ci.d/edk2.yml +1 -1
index 088ba4b43a..a9990b7147 100644
@@ -2,7 +2,7 @@ docker-edk2:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-edk2.yml
+   - .gitlab-ci.d/edk2.yml
    - .gitlab-ci.d/edk2/Dockerfile
    when: always
  image: docker:19.03.1
.gitlab-ci.d/opensbi.yml +1 -1
index dd051c0124..6a1750784a 100644
@@ -2,7 +2,7 @@ docker-opensbi:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-opensbi.yml
+   - .gitlab-ci.d/opensbi.yml
    - .gitlab-ci.d/opensbi/Dockerfile
    when: always
  image: docker:19.03.1
Signature · 1 line
2.18.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 16 lines · Thomas Huth

The edk2.yml and opensbi.yml files have recently been moved/renamed, but the change has not been reflected in the rules in the YML files yet.

Fixes 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")
---
 .gitlab-ci.d/edk2.yml    | 2 +-
 .gitlab-ci.d/opensbi.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
.gitlab-ci.d/edk2.yml +0 -0
index 088ba4b43a..a9990b7147 100644

.gitlab-ci.d/edk2.yml docker-edk2: · line 5

Quoted 5 lines
.gitlab-ci.d/edk2.yml +1 -1
@@ -2,7 +2,7 @@ docker-edk2:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-edk2.yml
+   - .gitlab-ci.d/edk2.yml

Thanks!

.gitlab-ci.d/opensbi.yml docker-opensbi: · line 5

Quoted 13 lines
.gitlab-ci.d/edk2.yml +0 -0
    - .gitlab-ci.d/edk2/Dockerfile
    when: always
  image: docker:19.03.1
.gitlab-ci.d/opensbi.yml +1 -1
index dd051c0124..6a1750784a 100644
@@ -2,7 +2,7 @@ docker-opensbi:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-opensbi.yml
+   - .gitlab-ci.d/opensbi.yml

FWIW:

./scripts/get_maintainer.pl -f .gitlab-ci.d/opensbi.yml get_maintainer.pl: No maintainers found, printing recent contributors. get_maintainer.pl: Do not blindly cc: them on patches! Use common sense.

Missed in c6fc0fc1a71a (apparently patchew bot was down when Bin sent the patch).

Cc'ing Alistair who Acked the patch (also missed in the same commit, see https://www.mail-archive.com/[email protected]/msg682407.html)

.gitlab-ci.d/opensbi.yml docker-opensbi: · line 8

Quoted 4 lines
.gitlab-ci.d/opensbi.yml +0 -0
    - .gitlab-ci.d/opensbi/Dockerfile
    when: always
  image: docker:19.03.1
#2 lore raw

Hi Philippe,

Quoted 42 lines · Philippe Mathieu-Daudé
Quoted 16 lines · Thomas Huth

The edk2.yml and opensbi.yml files have recently been moved/renamed, but the change has not been reflected in the rules in the YML files yet.

Fixes 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")
---
 .gitlab-ci.d/edk2.yml    | 2 +-
 .gitlab-ci.d/opensbi.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
.gitlab-ci.d/edk2.yml +0 -0
index 088ba4b43a..a9990b7147 100644

.gitlab-ci.d/edk2.yml docker-edk2: · line 5

Quoted 5 lines
.gitlab-ci.d/edk2.yml +1 -1
@@ -2,7 +2,7 @@ docker-edk2:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-edk2.yml
+   - .gitlab-ci.d/edk2.yml

Thanks!

.gitlab-ci.d/opensbi.yml docker-opensbi: · line 5

Quoted 13 lines
.gitlab-ci.d/edk2.yml +0 -0
    - .gitlab-ci.d/edk2/Dockerfile
    when: always
  image: docker:19.03.1
.gitlab-ci.d/opensbi.yml +1 -1
index dd051c0124..6a1750784a 100644
@@ -2,7 +2,7 @@ docker-opensbi:
  stage: build
  rules: # Only run this job when the Dockerfile is modified
  - changes:
-   - .gitlab-ci-opensbi.yml
+   - .gitlab-ci.d/opensbi.yml

FWIW:

Quoted 6 lines

./scripts/get_maintainer.pl -f .gitlab-ci.d/opensbi.yml get_maintainer.pl: No maintainers found, printing recent contributors. get_maintainer.pl: Do not blindly cc: them on patches! Use common sense.

Missed in c6fc0fc1a71a (apparently patchew bot was down when Bin sent the patch).

I will add an entry to MAINTAINERS file for this. Thanks!

Quoted 10 lines

Cc'ing Alistair who Acked the patch (also missed in the same commit, see https://www.mail-archive.com/[email protected]/msg682407.html)

.gitlab-ci.d/opensbi.yml docker-opensbi: · line 8

Quoted 4 lines
.gitlab-ci.d/opensbi.yml +0 -0
    - .gitlab-ci.d/opensbi/Dockerfile
    when: always
  image: docker:19.03.1

Regards,
Bin

#3 lore raw
In reply to Thomas Huth
Quoted 6 lines · Thomas Huth

The edk2.yml and opensbi.yml files have recently been moved/renamed, but the change has not been reflected in the rules in the YML files yet.

Fixes 922febe2af ("Move edk2 and opensbi YAML files to .gitlab-ci.d folder")

Queued to testing/next, thanks.

Signature · 1 line
Alex Bennée