* [PATCH 1/2] gitlab-ci: force git updates
@ 2020-12-09 10:57 Ross Burton
2020-12-09 10:57 ` [PATCH 2/2] kas: remove redundant env settings Ross Burton
2020-12-09 15:34 ` [meta-arm] [PATCH 1/2] gitlab-ci: force git updates Jon Mason
0 siblings, 2 replies; 3+ messages in thread
From: Ross Burton @ 2020-12-09 10:57 UTC (permalink / raw)
To: meta-arm
Explicitly force kas to update in case the repositories are reused.
Change-Id: Ieedf518c7586bb1a4eff274dc1a33b52a3c49d9f
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc5b7b4..f43dc8f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,7 +26,7 @@ stages:
extends: .setup
script:
- KASFILES=$(kas/jobs-to-kas $CI_JOB_NAME)
- - kas shell --update $KASFILES -c 'cat conf/*.conf'
+ - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
- kas build $KASFILES
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] kas: remove redundant env settings
2020-12-09 10:57 [PATCH 1/2] gitlab-ci: force git updates Ross Burton
@ 2020-12-09 10:57 ` Ross Burton
2020-12-09 15:34 ` [meta-arm] [PATCH 1/2] gitlab-ci: force git updates Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Ross Burton @ 2020-12-09 10:57 UTC (permalink / raw)
To: meta-arm
These are left over from an experiment and are no longer needed.
Change-Id: I27677b58e4c196371a394f47b185f71917848528
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
kas/base.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/kas/base.yml b/kas/base.yml
index 06ea962..3ed7c26 100644
--- a/kas/base.yml
+++ b/kas/base.yml
@@ -20,10 +20,6 @@ repos:
meta:
meta-poky:
-env:
- BB_LOGCONFIG: ""
- PYTHONPATH: ""
-
local_conf_header:
base: |
CONF_VERSION = "1"
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-arm] [PATCH 1/2] gitlab-ci: force git updates
2020-12-09 10:57 [PATCH 1/2] gitlab-ci: force git updates Ross Burton
2020-12-09 10:57 ` [PATCH 2/2] kas: remove redundant env settings Ross Burton
@ 2020-12-09 15:34 ` Jon Mason
1 sibling, 0 replies; 3+ messages in thread
From: Jon Mason @ 2020-12-09 15:34 UTC (permalink / raw)
To: Ross Burton; +Cc: meta-arm
On Wed, Dec 09, 2020 at 10:57:00AM +0000, Ross Burton wrote:
> Explicitly force kas to update in case the repositories are reused.
>
> Change-Id: Ieedf518c7586bb1a4eff274dc1a33b52a3c49d9f
> Signed-off-by: Ross Burton <ross.burton@arm.com>
Both patches applied to master.
Thanks,
Jon
> ---
> .gitlab-ci.yml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index fc5b7b4..f43dc8f 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -26,7 +26,7 @@ stages:
> extends: .setup
> script:
> - KASFILES=$(kas/jobs-to-kas $CI_JOB_NAME)
> - - kas shell --update $KASFILES -c 'cat conf/*.conf'
> + - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf'
> - kas build $KASFILES
>
>
> --
> 2.25.1
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-09 15:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-09 10:57 [PATCH 1/2] gitlab-ci: force git updates Ross Burton
2020-12-09 10:57 ` [PATCH 2/2] kas: remove redundant env settings Ross Burton
2020-12-09 15:34 ` [meta-arm] [PATCH 1/2] gitlab-ci: force git updates Jon Mason
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.