Skip to content

Commit 72a0227

Browse files
authored
Merge branch 'main' into cz-readme-fixes
2 parents 7e9f885 + 6f9124a commit 72a0227

File tree

4 files changed

+60
-8
lines changed

4 files changed

+60
-8
lines changed

.github/workflows/code_scanning.yaml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Copyright 2024 NVIDIA CORPORATION
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: "CodeQL"
16+
17+
on:
18+
pull_request:
19+
types:
20+
- opened
21+
- synchronize
22+
branches:
23+
- main
24+
- release-*
25+
push:
26+
branches:
27+
- main
28+
- release-*
29+
30+
jobs:
31+
analyze:
32+
name: Analyze Go code with CodeQL
33+
runs-on: ubuntu-latest
34+
timeout-minutes: 360
35+
permissions:
36+
security-events: write
37+
packages: read
38+
steps:
39+
- name: Checkout repository
40+
uses: actions/checkout@v4
41+
- name: Initialize CodeQL
42+
uses: github/codeql-action/init@v3
43+
with:
44+
languages: go
45+
build-mode: manual
46+
- shell: bash
47+
run: |
48+
make build
49+
- name: Perform CodeQL Analysis
50+
uses: github/codeql-action/analyze@v3
51+
with:
52+
category: "/language:go"

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: |
3636
echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
3737
- name: Set up Holodeck
38-
uses: NVIDIA/[email protected].1
38+
uses: NVIDIA/[email protected].3
3939
with:
4040
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
4141
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/staging_e2e.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ jobs:
3636
echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
3737
GOLANG_VERSION=$(./hack/golang-version.sh)
3838
echo "GOLANG_VERSION=${GOLANG_VERSION##GOLANG_VERSION := }" >> $GITHUB_ENV
39-
echo "HOLODECK_VCENTER_USERNAME=${HOLODECK_VCENTER_USERNAME}" >> $GITHUB_ENV
40-
echo "HOLODECK_VCENTER_PASSWORD=${HOLODECK_VCENTER_PASSWORD}" >> $GITHUB_ENV
41-
cat /home/runner/.ssh/vsphere-key > ${GITHUB_WORKSPACE}/holodeck_ssh_key
4239
- name: Set up Holodeck
43-
uses: NVIDIA/[email protected].2
40+
uses: NVIDIA/[email protected].3
4441
with:
42+
vsphere_username: ${{ secrets.VSPHERE_USERNAME }}
43+
vsphere_password: ${{ secrets.VSPHERE_PASSWORD }}
44+
vsphere_ssh_key: ${{ secrets.VSPHERE_SSH_KEY }}
4545
holodeck_config: "tests/e2e/infra/vsphere.yaml"
4646
- name: Intall dependencies
4747
run: |

deployments/container/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG GOLANG_VERSION=1.20.5
16-
FROM nvidia/cuda:12.5.1-base-ubi8 as build
15+
ARG GOLANG_VERSION=1.22.6
16+
FROM nvidia/cuda:12.6.0-base-ubi8 as build
1717

1818
RUN yum install -y \
1919
wget make git gcc \
@@ -44,7 +44,7 @@ ARG VERSION="N/A"
4444
ARG GIT_COMMIT="unknown"
4545
RUN make PREFIX=/artifacts cmds
4646

47-
FROM nvidia/cuda:12.5.1-base-ubi8
47+
FROM nvidia/cuda:12.6.0-base-ubi8
4848

4949
# Remove CUDA libs(compat etc) in favor of libs installed by the NVIDIA driver
5050
RUN dnf remove -y cuda-*

0 commit comments

Comments
 (0)