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

Apply DBR_VFIELD #42

Draft
wants to merge 19 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP: build again patched Base
mdavidsaver committed Jul 5, 2022
commit 8427d68ebe6ff7812295709eb5085e893978e4f1
9 changes: 3 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -47,16 +47,13 @@ environment:
matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
CMP: vs2019
BASE: 7.0
BASE: vfield
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
CMP: gcc
BASE: 7.0
BASE: vfield
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
CMP: vs2017
BASE: 7.0
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
CMP: vs2019
BASE: 3.15
BASE: vfield

# Platform: processor architecture
platform:
2 changes: 1 addition & 1 deletion .ci-local/defaults.set
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# EPICS Base
BASE_DIRNAME=base
BASE_REPONAME=epics-base
BASE_REPOOWNER=epics-base
BASE_REPOOWNER=mdavidsaver
BASE_VARNAME=EPICS_BASE
BASE_RECURSIVE=NO

3 changes: 1 addition & 2 deletions .github/workflows/ci-scripts-build.yml
Original file line number Diff line number Diff line change
@@ -17,14 +17,14 @@ on:
env:
SETUP_PATH: .ci-local:.ci
EPICS_TEST_IMPRECISE_TIMING: YES
BASE: vfield

jobs:
native:
name: ${{ matrix.name }}
runs-on: ${{ matrix.os }}
# Set environment variables from matrix parameters
env:
BASE: ${{ matrix.base }}
CMP: ${{ matrix.cmp }}
BCFG: ${{ matrix.configuration }}
WINE: ${{ matrix.wine }}
@@ -145,7 +145,6 @@ jobs:
image: ${{ matrix.image }}
# Set environment variables from matrix parameters
env:
BASE: ${{ matrix.base }}
CMP: ${{ matrix.cmp }}
BCFG: ${{ matrix.configuration }}
WINE: ${{ matrix.wine }}