-
Notifications
You must be signed in to change notification settings - Fork 6
Build ADURL with ci-scripts on Ubuntu using out GitLab server. #9
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
Open
pheest
wants to merge
4
commits into
areaDetector:master
Choose a base branch
from
pheest:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| #!/bin/bash | ||
|
|
||
| # This script installs ADCore R3-11 | ||
| # | ||
| # check if user has right permissions | ||
| if [ "$(id -u)" != "0" ]; then | ||
| echo "Sorry, you are not root. Please try again using sudo." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # terminate script after first line that fails | ||
| set -e | ||
|
|
||
| if [ -z "$EPICS_HOST_ARCH" ] | ||
| then | ||
| EPICS_HOST_ARCH=linux-x86_64 | ||
| fi | ||
|
|
||
| # The directory above | ||
| SUPPORT="$(dirname "${PWD}")" | ||
|
|
||
| # This won't have been set yet on the ADCore pass. | ||
| ADCORE=$PWD | ||
|
|
||
| # This file will have been written by ci-scripts cue.py | ||
| source $SUPPORT/RELEASE.local | ||
|
|
||
| # Hack RELEASE_LIBS.local file | ||
| sed -i -e "/^ADCORE\s*=/ s,=.*,=$ADCORE," $AREA_DETECTOR/configure/RELEASE_LIBS.local | ||
|
|
||
| # Hack RELEASE_PRODS.local file | ||
| sed -i -e "/^ADCORE\s*=/ s,=.*,=$ADCORE," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
|
|
||
| # These are example plugin files, but we will just use them | ||
| if [ ! -f $ADCORE/iocBoot/commonPlugins.cmd ]; then | ||
| cp $ADCORE/iocBoot/EXAMPLE_commonPlugins.cmd $ADCORE/iocBoot/commonPlugins.cmd | ||
| fi | ||
|
|
||
| # Hack commonPlugins.cmd - we need sseq_settings.req, which is in the calc module | ||
| sed -i "s/#set_requestfile_path(\"\$(CALC)\/calcApp\/Db\")/set_requestfile_path(\"\$(CALC)\/calcApp\/Db\")/" $ADCORE/iocBoot/commonPlugins.cmd | ||
| if [ ! -f $ADCORE/iocBoot/commonPlugin_settings.req ]; then | ||
| cp $ADCORE/iocBoot/EXAMPLE_commonPlugin_settings.req $ADCORE/iocBoot/commonPlugin_settings.req | ||
| fi | ||
|
|
||
| # Hack the make file to allow multiple definition of `_Unwind_Resume on Linux. | ||
| # sed -i -e '/^include \$(TOP)\/ADApp\/commonLibraryMakefile/i ifeq (mingw, \$(findstring mingw, \$(T_A)))' $ADCORE/ADApp/pluginSrc/Makefile | ||
| # sed -i -e '/^include \$(TOP)\/ADApp\/commonLibraryMakefile/i \ \ USR_LDFLAGS += -Wl,-allow-multiple-definition' $ADCORE/ADApp/pluginSrc/Makefile | ||
| # sed -i -e '/^include \$(TOP)\/ADApp\/commonLibraryMakefile/i endif' $ADCORE/ADApp/pluginSrc/Makefile | ||
|
|
||
|
|
||
| if [ "$WINE" == "64" ]; then | ||
| if [ ! -f /usr/bin/x86_64-w64-mingw32-g++-win32 ]; then | ||
| apt-get install -y g++-mingw-w64-x86-64 | ||
| fi | ||
| # see https://github.com/randombit/botan/issues/2039 | ||
| update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-win32 | ||
| elif [ "$WINE" == "32" ]; then | ||
| if [ ! -f /usr/bin/i686-w64-mingw32-g++-win32 ]; then | ||
| apt-get install -y g++-mingw-w64-i686 | ||
| fi | ||
| update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-win32 | ||
| fi | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/bin/bash | ||
|
|
||
| # This script configures ADSupport R1-9 | ||
| # | ||
| # check if user has right permissions | ||
| if [ "$(id -u)" != "0" ]; then | ||
| echo "Sorry, you are not root. Please try again using sudo." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # terminate script after first line that fails | ||
| set -e | ||
|
|
||
| if [ -z "$EPICS_HOST_ARCH" ]; then | ||
| EPICS_HOST_ARCH=linux-x86_64 | ||
| fi | ||
| apt-get install -y libx11-dev libxext-dev | ||
|
|
||
| # The directory above | ||
| SUPPORT="$(dirname "${PWD}")" | ||
|
|
||
| # This won't have been set yet on the ADSupport pass. | ||
| ADSUPPORT=$PWD | ||
|
|
||
| # This file will have been written by ci-scripts cue.py | ||
| source $SUPPORT/RELEASE.local | ||
|
|
||
| # Hack RELEASE_LIBS.local file | ||
| sed -i -e "/^ADSUPPORT\s*=/ s,=.*,=$ADSUPPORT," $AREA_DETECTOR/configure/RELEASE_LIBS.local | ||
|
|
||
| # Hack RELEASE_PRODS.local file | ||
| sed -i -e "/^ADSUPPORT\s*=/ s,=.*,=$ADSUPPORT," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| #!/bin/bash | ||
|
|
||
| # This script installs NDS and NDS-epics | ||
| # | ||
| # check if user has right permissions | ||
| if [ "$(id -u)" != "0" ]; then | ||
| echo "Sorry, you are not root. Please try again using sudo." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # terminate script after first line that fails | ||
| set -e | ||
|
|
||
| apt-get install -y libreadline6-dev libncurses5-dev perl clang g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86 re2c tar | ||
| apt-get install -y build-essential git python curl p7zip-full wget libxml2-dev | ||
|
|
||
| export GITLAB_CI=1 | ||
| export SETUP_PATH=".ci-local:.ci" | ||
| export BASE_RECURSIVE="YES" | ||
| export CMP="gcc" | ||
| export BGFC="default" | ||
| export SET="stable" | ||
| export CLEAN_DEPS="NO" | ||
| export WINE=64 | ||
| export VV=1 | ||
| export CLEAN_DEPS="NO" | ||
| python .ci/cue.py prepare > /tmp/adurl_install.log 2>&1 | ||
| python .ci/cue.py build >> /tmp/adurl_install.log 2>&1 | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| #!/bin/bash | ||
|
|
||
| # This script configures areadetector R3-11 | ||
| # | ||
| # check if user has right permissions | ||
| if [ "$(id -u)" != "0" ]; then | ||
| echo "Sorry, you are not root. Please try again using sudo." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # terminate script after first line that fails | ||
| set -e | ||
|
|
||
| if [ -z "$EPICS_HOST_ARCH" ] | ||
| then | ||
| EPICS_HOST_ARCH=linux-x86_64 | ||
| fi | ||
| apt-get install -y libx11-dev libxext-dev | ||
|
|
||
| # The directory above | ||
| SUPPORT="$(dirname "${PWD}")" | ||
|
|
||
| # This won't have been set yet on the areaDetector pass. | ||
| AREA_DETECTOR=$PWD | ||
|
|
||
| # This file will have been written by ci-scripts cue.py | ||
| source $SUPPORT/RELEASE.local | ||
|
|
||
| pushd $AREA_DETECTOR/configure | ||
| echo "Copying from example." | ||
| ./copyFromExample | ||
| popd | ||
|
|
||
| #hack config_site.local | ||
| sed -i -e "/^WITH_PVA\s*=/ s,=.*,=YES," $AREA_DETECTOR/configure/CONFIG_SITE.local | ||
| sed -i -e "/^WITH_OPENCV\s*=/ s,=.*,=NO," $AREA_DETECTOR/configure/CONFIG_SITE.local | ||
| sed -i -e "/^WITH_QSRV\s*=/ s,=.*,=NO," $AREA_DETECTOR/configure/CONFIG_SITE.local | ||
| sed -i -e "/^WITH_BITSHUFFLE\s*=/ s,=.*,=NO," $AREA_DETECTOR/configure/CONFIG_SITE.local | ||
|
|
||
| # EXAMPLE_CONFIG_SITE.local.linux-x86_64 sets WITH_BOOST. I don't wannit. | ||
| if [ -f $AREA_DETECTOR/configure/CONFIG_SITE.local.$EPICS_HOST_ARCH ]; then | ||
| rm $AREA_DETECTOR/configure/CONFIG_SITE.local.$EPICS_HOST_ARCH | ||
| fi | ||
|
|
||
| # Hack RELEASE.local.linux-x86_64 file | ||
| # NB, this file currently points to ADPointGrey, ADEiger and ADAravis. | ||
| # I'm not installing these modules. | ||
| if [ -f $AREA_DETECTOR/configure/RELEASE.local.$EPICS_HOST_ARCH ]; then | ||
| rm $AREA_DETECTOR/configure/RELEASE.local.$EPICS_HOST_ARCH | ||
| fi | ||
| echo EPICS_BASE=$EPICS_BASE > $AREA_DETECTOR/configure/RELEASE.local | ||
|
|
||
| # Hack RELEASE_LIBS.local file | ||
| sed -i -e "/^SUPPORT\s*=/ s,=.*,=$SUPPORT," $AREA_DETECTOR/configure/RELEASE_LIBS.local | ||
| sed -i -e "/^ASYN\s*=/ s,=.*,=$ASYN," $AREA_DETECTOR/configure/RELEASE_LIBS.local | ||
| sed -i -e "/^EPICS_BASE\s*=/ s,=.*,=$EPICS_BASE," $AREA_DETECTOR/configure/RELEASE_LIBS.local | ||
| sed -i -e "/^AREA_DETECTOR\s*=/ s,=.*,=$AREA_DETECTOR," $AREA_DETECTOR/configure/RELEASE_LIBS.local | ||
|
|
||
| # Hack RELEASE_PRODS.local file | ||
| sed -i -e "/^SUPPORT\s*=/ s,=.*,=$SUPPORT," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^CALC\s*=/ s,=.*,=$CALC," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^BUSY\s*=/ s,=.*,=$BUSY," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^SSCAN\s*=/ s,=.*,=$SSCAN," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^AUTOSAVE\s*=/ s,=.*,=$AUTOSAVE," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^SNCSEQ\s*=/ s,=.*,=$SNCSEQ," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^EPICS_BASE\s*=/ s,=.*,=$EPICS_BASE," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^ASYN\s*=/ s,=.*,=$ASYN," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
| sed -i -e "/^AREA_DETECTOR\s*=/ s,=.*,=$AREA_DETECTOR," $AREA_DETECTOR/configure/RELEASE_PRODS.local | ||
|
|
||
| # Don't think we need this. | ||
| sed -i "s/DEVIOCSTATS/#DEVIOCSTATS/g" $AREA_DETECTOR/configure/RELEASE_PRODS.local |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| MODULES=sncseq sscan calc asyn autosave busy area_Detector ADSupport ADCore | ||
|
|
||
| BASE=R7.0.6.1 | ||
| SNCSEQ=R2-2-9 | ||
| SSCAN=R2-11-5 | ||
| CALC=R3-7-4 | ||
| ASYN=R4-41 | ||
| BUSY=R1-7-1 | ||
| AUTOSAVE=R5-7-1 | ||
|
|
||
| AREA_DETECTOR=R3-11 | ||
| AREA_DETECTOR_REPOURL=https://github.com/areaDetector/areaDetector | ||
| AREA_DETECTOR_RECURSIVE=NO | ||
| AREA_DETECTOR_HOOK=.ci-local/area_detector_hook.sh | ||
| ADSUPPORT=master | ||
| ADSUPPORT_REPOURL=https://github.com/pheest/ADSupport | ||
| ADSUPPORT_RECURSIVE=NO | ||
| ADSUPPORT_HOOK=.ci-local/adsupport_hook.sh | ||
| ADCORE=master | ||
| ADCORE_REPOURL=https://github.com/pheest/ADCore | ||
| ADCORE_RECURSIVE=NO | ||
| ADCORE_HOOK=.ci-local/adcore_hook.sh | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| # .gitlab-ci.yml for testing EPICS Base ci-scripts | ||
| # (see: https://github.com/epics-base/ci-scripts) | ||
|
|
||
| # This is YAML - indentation levels are crucial | ||
|
|
||
| # GitLab runner can use any Docker container, we're using this one | ||
| # to be comparable with the other CI services | ||
| image: ubuntu:focal | ||
|
|
||
| cache: | ||
| key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" | ||
| paths: | ||
| - .cache/ | ||
|
|
||
| variables: | ||
| DEBIAN_FRONTEND: noninteractive | ||
| GIT_SUBMODULE_STRATEGY: "recursive" | ||
| SETUP_PATH: ".ci-local:.ci" | ||
| BASE_RECURSIVE: "YES" | ||
| # Additional packages needed for | ||
| # | EPICS |clang| Windows cross builds |RTEMS testing |sequencer | ||
| APT: "libreadline6-dev libncurses5-dev perl clang g++-mingw-w64-i686 g++-mingw-w64-x86-64 qemu-system-x86 re2c" | ||
| CMP: "gcc" | ||
| BGFC: "default" | ||
| SET: stable | ||
| CLEAN_DEPS: "NO" | ||
|
|
||
| # Template for build jobs (hidden) | ||
| .build: | ||
| stage: build | ||
| before_script: | ||
| - apt-get update -qq && apt-get install -y -qq build-essential git python curl p7zip-full libgtest-dev libxml2-dev | ||
| - python .ci/cue.py prepare | ||
| script: | ||
| - python .ci/cue.py build | ||
| - python .ci/cue.py test | ||
| - python .ci/cue.py test-results | ||
|
|
||
| # If you need to do more during install and build, | ||
| # add a local directory to your module and do e.g. | ||
| # - ./.ci-local/travis/install-extras.sh | ||
|
|
||
| # Define build jobs | ||
|
|
||
| # Well-known variables to use | ||
| # SET source setup file | ||
| # ADD_MODULES extra modules (for a specific job) | ||
| # BCFG build configuration (static/debug/static-debug; | ||
| # default: shared-optimized) | ||
| # TEST set to NO to skip running the tests (default: YES) | ||
| # VV set to make build scripts verbose (default: unset) | ||
| # EXTRA content will be added to make command line | ||
| # EXTRA1..5 more additional arguments for the make command | ||
| # (one argument per variable) | ||
|
|
||
| # Usually from setup files, but may be specified or overridden | ||
| # on a job line | ||
| # MODULES list of dependency modules | ||
| # BASE branch or release tag name of the EPICS Base to use | ||
| # <MODULE> branch or release tag for a specific module | ||
| # ... see README for setup file syntax description | ||
|
|
||
| # Different configurations of gcc and clang | ||
| gcc_default: | ||
| extends: .build | ||
| variables: | ||
|
|
||
| gcc_static: | ||
| extends: .build | ||
| variables: | ||
| BCFG: "static" | ||
|
|
||
| clang_default: | ||
| extends: .build | ||
| variables: | ||
| CMP: "clang" | ||
|
|
||
| clang_static_c++11: | ||
| extends: .build | ||
| variables: | ||
| CMP: "clang" | ||
| BCFG: "static" | ||
| EXTRA: "CMD_CXXFLAGS=-std=c++11" | ||
|
|
||
| # Cross-compilations to Windows using gcc/MinGW and WINE | ||
| wine32_default: | ||
| extends: .build | ||
| variables: | ||
| WINE: "32" | ||
|
|
||
| wine64_default: | ||
| extends: .build | ||
| variables: | ||
| WINE: "64" | ||
|
|
||
| wine64_debug: | ||
| extends: .build | ||
| variables: | ||
| WINE: "64" | ||
| BCFG: "debug" | ||
|
|
||
| wine64_static: | ||
| extends: .build | ||
| variables: | ||
| WINE: "64" | ||
| BCFG: "static" | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Documenting for posterity, this was likely fixed by areaDetector/ADCore#481 ?