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

build: Simplify builds #3478

Merged
merged 15 commits into from Jul 15, 2020
Merged

build: Simplify builds #3478

merged 15 commits into from Jul 15, 2020

Conversation

alexec
Copy link
Contributor

@alexec alexec commented Jul 14, 2020

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this is a chore.
  • The title of the PR is (a) conventional, (b) states what changed, and (c) suffixes the related issues number. E.g. "fix(controller): Updates such and such. Fixes #1234".
  • I've signed the CLA.
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My builds are green. Try syncing with master if they are not.
  • My organization is added to USERS.md.

@simster7 @sarabala1979 I've been spending too much time fixing builds recently and want to simplify them.

This change will mean that we no longer build branch images (i.e. no images name argoproj/argocli:my-branch instead, they will be latest. You must run make clean whenever you change branch to get new images.

@alexec alexec requested a review from simster7 July 14, 2020 22:14
@alexec
Copy link
Contributor Author

alexec commented Jul 14, 2020

I've re-enabled up-to-date with master check.

@alexec alexec changed the title docs: Fix CLI docs build: Forward-port changes from release-2.9 Jul 15, 2020
mkdir -p /tmp/log/argo-e2e
KUBECONFIG=~/.kube/config make start PROFILE=$PROFILE E2E_EXECUTOR=docker DEV_IMAGE=true > /tmp/log/argo-e2e/argo.log &
git fetch --tags
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this was a key fix

mkdir -p /tmp/log/argo-e2e
KUBECONFIG=~/.kube/config make start PROFILE=$PROFILE E2E_EXECUTOR=docker DEV_IMAGE=true > /tmp/log/argo-e2e/argo.log &
git fetch --tags
KUBECONFIG=~/.kube/config make start PROFILE=$PROFILE E2E_EXECUTOR=docker DEV_IMAGE=true 2>&1 > /tmp/log/argo-e2e/argo.log &
Copy link
Contributor Author

Choose a reason for hiding this comment

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

also pipe stderr

@@ -102,14 +99,10 @@ jobs:
codegen:
name: Codegen
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 15
Copy link
Contributor Author

Choose a reason for hiding this comment

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

occasionally this takes longer than 10m

@@ -21,10 +21,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@simster7 thoughts on this change?

Copy link
Member

Choose a reason for hiding this comment

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

All good with me as long as it plays nice with GIT_BRANCH = $(shell git branch --show-current), which was the original reason for the code being this way

@@ -1,4 +1,4 @@
# Resume The Template
# Resume A Workflow
Copy link
Contributor Author

Choose a reason for hiding this comment

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

error

docs/cli/argo_list.md Outdated Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@alexec alexec changed the title build: Forward-port changes from release-2.9 build: Simplify builds Jul 15, 2020
@@ -21,10 +21,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
Copy link
Member

Choose a reason for hiding this comment

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

All good with me as long as it plays nice with GIT_BRANCH = $(shell git branch --show-current), which was the original reason for the code being this way

@alexec alexec merged commit 24d1e52 into argoproj:master Jul 15, 2020
@alexec alexec deleted the fix-master branch July 15, 2020 19:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants