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

Sorts label styles generated from label_sync #9633

Merged
merged 1 commit into from
Sep 29, 2018

Conversation

qhuynh96
Copy link
Contributor

Fixes labels' styles moving around busted in #9437

/cc @justaugustus
/cc @cblecker

@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. area/label_sync Issues or PRs related to code in /label_sync area/prow Issues or PRs related to prow area/prow/deck Issues or PRs related to prow's deck component cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 29, 2018
@justaugustus
Copy link
Member

@qhuynh96 -- thanks for taking a look at this!

I tested this locally and the hack/verify-labels.sh appears to return consistently now:

[augustus@auggiebook01 test-infra]$ git remote update
Fetching origin
Fetching up
[augustus@auggiebook01 test-infra]$ git fetch up pull/9633/head:test-fix-label-css
From github.com:kubernetes/test-infra
 * [new ref]             refs/pull/9633/head -> test-fix-label-css
[augustus@auggiebook01 test-infra]$ git checkout test-fix-label-css 
Switched to branch 'test-fix-label-css'
[augustus@auggiebook01 test-infra]$ git cherry-pick 43565a9756b9bb952d4eea7dac60ce56b66684c9
error: could not apply 43565a975... Add kind/kep label for k/{community,features}
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
[augustus@auggiebook01 test-infra]$ git diff
diff --cc prow/cmd/deck/static/labels.css
index 6eae7bc9e,18ea6620f..000000000
--- a/prow/cmd/deck/static/labels.css
+++ b/prow/cmd/deck/static/labels.css
<SNIPPED>
  
[augustus@auggiebook01 test-infra]$ git status
On branch test-fix-label-css
You are currently cherry-picking commit 43565a975.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:

	modified:   label_sync/labels.md
	modified:   label_sync/labels.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   prow/cmd/deck/static/labels.css

[augustus@auggiebook01 test-infra]$ time ./hack/update-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
  bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 1.787s, Critical Path: 1.63s
INFO: 2 processes: 2 linux-sandbox.
INFO: Build completed successfully, 3 total actions
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.md.tmpl' '--docs-output=/home/augustus/prj/k8s/test-infra/label_sync/labels.md' '--css-template=/home/augustus/prj/k8s/test-infra/label_sync/labels.css.tmpl' '--css-output=/home/augustus/pINFO: Build completed successfully, 3 total actions
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra

real	0m1.905s
user	0m0.069s
sys	0m0.045s
[augustus@auggiebook01 test-infra]$ time ./hack/verify-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
  bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 0.326s, Critical Path: 0.16s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-iINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community

real	0m0.464s
user	0m0.089s
sys	0m0.046s
[augustus@auggiebook01 test-infra]$ time ./hack/verify-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
  bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 0.323s, Critical Path: 0.15s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-iINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features

real	0m0.435s
user	0m0.069s
sys	0m0.034s
[augustus@auggiebook01 test-infra]$ time ./hack/verify-labels.sh 
INFO: Analysed target //label_sync:label_sync (0 packages loaded).
INFO: Found 1 target...
Target //label_sync:label_sync up-to-date:
  bazel-bin/label_sync/linux_amd64_stripped/label_sync
INFO: Elapsed time: 0.357s, Critical Path: 0.14s
INFO: 0 processes.
INFO: Build completed successfully, 1 total action
INFO: Running command line: bazel-bin/label_sync/linux_amd64_stripped/label_sync '--config=/home/augustus/prj/k8s/test-infra/label_sync/labels.yaml' '--action=docs' '--docs-template=/home/augustus/prj/k8s/test-iINFO: Build completed successfully, 1 total action
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/test-infra
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/community
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/features
WARN[0000] Repo isn't inside orgs                        org=kubernetes orgs= repo=kubernetes/kubernetes

real	0m0.531s
user	0m0.102s
sys	0m0.067s

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 29, 2018
@justaugustus justaugustus mentioned this pull request Sep 29, 2018
@krzyzacy
Copy link
Member

/approve
thanks!

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: justaugustus, krzyzacy, qhuynh96

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2018
@k8s-ci-robot k8s-ci-robot merged commit bbe6a13 into kubernetes:master Sep 29, 2018
@qhuynh96 qhuynh96 deleted the sort-label-css branch September 29, 2018 23:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/label_sync Issues or PRs related to code in /label_sync area/prow/deck Issues or PRs related to prow's deck component area/prow Issues or PRs related to prow cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants