Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bob.devtools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bob
bob.devtools
Commits
6ca8652b
Commit
6ca8652b
authored
6 years ago
by
André Anjos
Browse files
Options
Downloads
Patches
Plain Diff
[ci] More fixes (bis)
parent
cfc141a8
No related branches found
No related tags found
No related merge requests found
Pipeline
#25794
canceled
6 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ci/bootstrap.sh
+1
-1
1 addition, 1 deletion
ci/bootstrap.sh
ci/build.sh
+2
-2
2 additions, 2 deletions
ci/build.sh
with
3 additions
and
3 deletions
ci/bootstrap.sh
+
1
−
1
View file @
6ca8652b
...
@@ -38,7 +38,7 @@ merge_conda_cache() {
...
@@ -38,7 +38,7 @@ merge_conda_cache() {
_urlstxt
=
"
${
1
}
/urls.txt"
_urlstxt
=
"
${
1
}
/urls.txt"
if
[
-e
${
2
}
]
;
then
if
[
-e
${
2
}
]
;
then
log_info
"Merging urls.txt and packages with cached files..."
log_info
"Merging urls.txt and packages with cached files..."
mv
${
2
}
/
*
.tar.bz2
${
1
}
/
log_info
mv
${
2
}
/
*
.tar.bz2
${
1
}
/
cat
${
_urlstxt
}
${
_cached_urlstxt
}
|
sort
|
uniq
>
${
_urlstxt
}
cat
${
_urlstxt
}
${
_cached_urlstxt
}
|
sort
|
uniq
>
${
_urlstxt
}
fi
fi
fi
fi
...
...
This diff is collapsed.
Click to expand it.
ci/build.sh
+
2
−
2
View file @
6ca8652b
...
@@ -63,8 +63,8 @@ else
...
@@ -63,8 +63,8 @@ else
fi
fi
log_info
"
$
${
CONDA_ROOT
}
/bin/python
${
CI_PROJECT_DIR
}
/ci/nextbuild.py
${
channel
}
${
CI_PROJECT_NAME
}
${
BOB_PACKAGE_VERSION
}
${
PYTHON_VERSION
}
"
log_info
"
$
${
CONDA_ROOT
}
/bin/python
${
CI_PROJECT_DIR
}
/ci/nextbuild.py
${
channel
}
${
CI_PROJECT_NAME
}
${
BOB_PACKAGE_VERSION
}
${
PYTHON_VERSION
}
"
BOB_BUILD_NUMBER
=
$(
${
CONDA_ROOT
}
/bin/python
${
CI_PROJECT_DIR
}
/ci/nextbuild.py
${
channel
}
${
CI_PROJECT_NAME
}
${
BOB_PACKAGE_VERSION
}
${
PYTHON_VERSION
}
)
export
BOB_BUILD_NUMBER
=
$(
${
CONDA_ROOT
}
/bin/python
${
CI_PROJECT_DIR
}
/ci/nextbuild.py
${
channel
}
${
CI_PROJECT_NAME
}
${
BOB_PACKAGE_VERSION
}
${
PYTHON_VERSION
}
)
export_env
BOB_BUILD_NUMBER
check_defined
BOB_BUILD_NUMBER
# copy the recipe_append.yaml over before build
# copy the recipe_append.yaml over before build
run_cmd
cp
${
CI_PROJECT_DIR
}
/bob/devtools/data/recipe_append.yaml conda/
run_cmd
cp
${
CI_PROJECT_DIR
}
/bob/devtools/data/recipe_append.yaml conda/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment