Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update .github directory to be v1.11 branch specific #17986

Merged
merged 1 commit into from Nov 26, 2021

Conversation

aanm
Copy link
Member

@aanm aanm commented Nov 23, 2021

Some workflows need to be changed to be v1.11 specific. Also other
workflows and configurations can be removed since they are only used on
the master branch.

To perform this task the .github directory from the previous stable
branch was copy pasted and there was a manual check of the diff between
the modified files and the files from master branch. Heuristically,
this meant removing all GH workflows that were triggered by
issue_comment and the ones that are exclusively cron jobs, as well as
modifying the remaining workflows to be specific for this v1.11 stable
branch.

Signed-off-by: André Martins andre@cilium.io

@aanm aanm added the release-note/misc This PR makes changes that have no direct user impact. label Nov 23, 2021
@aanm aanm requested review from a team as code owners November 23, 2021 17:25
Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤯 This looks like a lot of work. I'm going to mostly just assume you caught everything that needs updating here.

Copy link
Member

@nbusseneau nbusseneau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Workflow changes LGTM. Was a good thing cause I noticed I had incorrectly set up the cilium-v1.11-runtime-kernel-net-next job to still be cilium-v1.11-runtime-kernel-4.9 as on 1.10, but we changed that recently :)

@qmonnet qmonnet added the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Nov 25, 2021
@aanm aanm removed the dont-merge/needs-rebase This PR needs to be rebased because it has merge conflicts. label Nov 25, 2021
@qmonnet qmonnet mentioned this pull request Nov 26, 2021
12 tasks
Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple questions below.

.github/workflows/build-images-ci.yaml Show resolved Hide resolved
.github/workflows/lint-bpf-checks.yaml Outdated Show resolved Hide resolved
.github/workflows/lint-build-commits.yaml Outdated Show resolved Hide resolved
Some workflows need to be changed to be v1.11 specific. Also other
workflows and configurations can be removed since they are only used on
the master branch.

To perform this task the `.github` directory from the previous stable
branch was copy pasted and there was a manual check of the diff between
the modified files and the files from `master` branch. Heuristically,
this meant removing all GH workflows that were triggered by
`issue_comment` and the ones that are exclusively cron jobs, as well as
modifying the remaining workflows to be specific for this v1.11 stable
branch.

Signed-off-by: André Martins <andre@cilium.io>
@aanm
Copy link
Member Author

aanm commented Nov 26, 2021

pushed the following diff:

diff --git a/.github/workflows/lint-bpf-checks.yaml b/.github/workflows/lint-bpf-checks.yaml
index 48465af8fc..88096fe51b 100644
--- a/.github/workflows/lint-bpf-checks.yaml
+++ b/.github/workflows/lint-bpf-checks.yaml
@@ -30,7 +30,6 @@ jobs:
         uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
         id: changes
         with:
-          base: ${{ github.event.pull_request.base.sha || github.event.before }}
           filters: |
             bpf-tree:
               - 'bpf/**'
diff --git a/.github/workflows/lint-build-commits.yaml b/.github/workflows/lint-build-commits.yaml
index 4c2cae5e02..08443038bd 100644
--- a/.github/workflows/lint-build-commits.yaml
+++ b/.github/workflows/lint-build-commits.yaml
@@ -64,7 +64,6 @@ jobs:
         uses: dorny/paths-filter@b2feaf19c27470162a626bd6fa8438ae5b263721
         id: bpf-tree
         with:
-          base: ${{ github.event.pull_request.base.sha }}
           filters: |
             src:
               - 'bpf/**'
@@ -85,7 +84,6 @@ jobs:
         uses: dorny/paths-filter@78ab00f87740f82aec8ed8826eb4c3c851044126
         id: test-tree
         with:
-          base: ${{ github.event.pull_request.base.sha }}
           filters: |
             src:
               - 'test/**'

@aanm aanm merged commit 8bbae9c into cilium:v1.11 Nov 26, 2021
@aanm aanm deleted the pr/update-gh-workflows branch November 26, 2021 19:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants