Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into read-keyonly
Browse files Browse the repository at this point in the history
  • Loading branch information
jrw972 committed May 6, 2024
2 parents 46438a1 + d33d51b commit 4dc5d06
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
17 changes: 7 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

# The jobs with latest-release configuration are disabled until OpenDDS 3.28
# which will have the updated ValueReader and ValueWriter interfaces.

jobs:
build:
strategy:
Expand All @@ -27,7 +24,7 @@ jobs:
- 20
opendds_branch:
- master
#- latest-release
- latest-release
m:
- {os: ubuntu-22.04, dds_security: 1}
- {os: ubuntu-22.04, dds_security: 0}
Expand All @@ -38,29 +35,29 @@ jobs:

runs-on: ${{ matrix.m.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: 'Checkout MPC'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: DOCGroup/MPC
path: MPC
fetch-depth: 1
- name: 'Checkout ACE_TAO'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: DOCGroup/ACE_TAO
ref: ace6tao2
path: ACE_TAO
fetch-depth: 1
- name: 'Checkout OpenDDS'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: OpenDDS/OpenDDS
ref: ${{ matrix.opendds_branch }}
path: OpenDDS
fetch-depth: 1
- name: 'Set Up node'
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node_version }}
- name: 'Install xerces (ubuntu)'
Expand All @@ -84,7 +81,7 @@ jobs:
uses: lukka/run-vcpkg@v11
with:
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
vcpkgGitCommitId: 53bef8994c541b6561884a8395ea35715ece75db
vcpkgGitCommitId: 898b728edc5e0d12b50015f9cd18247c4257a3eb
runVcpkgInstall: true
- name: 'Set Up MSVC Environment'
if: ${{ matrix.m.os == 'windows-2022' }}
Expand Down

0 comments on commit 4dc5d06

Please sign in to comment.