Skip to content

Commit 328252d

Browse files
author
alianides
committed
update devcontainer.json and workflows to reference @0.11.0-nightly, updated triggers, updated image tag calcuations
1 parent 30ff9c0 commit 328252d

File tree

5 files changed

+19
-14
lines changed

5 files changed

+19
-14
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"spacefx-dev"
88
],
99
"features": {
10-
"ghcr.io/microsoft/azure-orbital-space-sdk/spacefx-dev:0.11.0": {
10+
"ghcr.io/microsoft/azure-orbital-space-sdk/spacefx-dev:0.11.0-nightly": {
1111
"app_name": "spacesdk-setup",
1212
"app_type": "none"
1313
}

‎.github/workflows/devcontainer-feature-build-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Display Ubuntu version
3535
run: lsb_release -a
3636

37-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
37+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
3838
with:
3939
env_file: ./env/spacefx.env
4040
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}

‎.github/workflows/run-setup-tests-smb-on.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ jobs:
3131
- name: Display Ubuntu version
3232
run: lsb_release -a
3333

34-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
34+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
3535
with:
3636
env_file: ./env/spacefx.env
3737
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
3838
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
3939
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
4040
VER_DOCKER_MAX: ${{ inputs.VER_DOCKER_MAX }}
4141

42-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/switch-smb@main
42+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/switch-smb@0.11.0-nightly
4343
with:
4444
REPO_DIR: "${PWD}"
4545
VALUE: "true"
@@ -63,7 +63,7 @@ jobs:
6363
- name: Display Ubuntu version
6464
run: lsb_release -a
6565

66-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
66+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
6767
with:
6868
env_file: ./env/spacefx.env
6969
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}

‎.github/workflows/run-setup-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Display Ubuntu version
3232
run: lsb_release -a
3333

34-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
34+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
3535
with:
3636
env_file: ./env/spacefx.env
3737
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
@@ -58,7 +58,7 @@ jobs:
5858
- name: Display Ubuntu version
5959
run: lsb_release -a
6060

61-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
61+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
6262
with:
6363
env_file: ./env/spacefx.env
6464
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}

‎.github/workflows/spacefx-images-build.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
packages: write
1515

1616
steps:
17-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
17+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
1818
with:
1919
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
2020
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
2121
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
2222

23-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@main
23+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@0.11.0-nightly
2424
with:
2525
docker-file: /var/spacedev/build/spacesdk-base/Dockerfile.spacesdk-base
2626
architecture: amd64
@@ -35,13 +35,13 @@ jobs:
3535
packages: write
3636

3737
steps:
38-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
38+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
3939
with:
4040
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
4141
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
4242
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
4343

44-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@main
44+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@0.11.0-nightly
4545
with:
4646
docker-file: ./build/spacesdk-base/Dockerfile.spacesdk-base
4747
architecture: arm64
@@ -57,7 +57,7 @@ jobs:
5757
packages: write
5858

5959
steps:
60-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
60+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
6161
with:
6262
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
6363
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
@@ -106,7 +106,7 @@ jobs:
106106
packages: write
107107

108108
steps:
109-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
109+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
110110
with:
111111
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
112112
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
@@ -155,7 +155,7 @@ jobs:
155155
packages: write
156156

157157
steps:
158-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
158+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
159159
with:
160160
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
161161
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
@@ -167,6 +167,9 @@ jobs:
167167
echo "Sourcing environment variables..."
168168
source ./env/spacefx.env
169169
170+
SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}"
171+
[[ "${SPACEFX_CHANNEL}" != "stable" ]] && SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}-${SPACEFX_CHANNEL}"
172+
170173
# Build the SpaceSDK-Jetson-DeviceQuery Versions
171174
CUDA_VERSIONS=("11.4" "12.2")
172175
for i in "${!CUDA_VERSIONS[@]}"; do
@@ -178,6 +181,7 @@ jobs:
178181
--repo-dir ${PWD} \
179182
--no-spacefx-dev \
180183
--app-name spacesdk-jetson-devicequery \
184+
--build-arg SDK_VERSION="${SPACEFX_VERSION_CHANNEL_TAG}" \
181185
--annotation-config azure-orbital-space-sdk-setup.yaml
182186
183187
/var/spacedev/build/build_containerImage.sh \
@@ -187,6 +191,7 @@ jobs:
187191
--repo-dir ${PWD} \
188192
--no-spacefx-dev \
189193
--app-name spacesdk-jetson-devicequery \
194+
--build-arg SDK_VERSION="${SPACEFX_VERSION_CHANNEL_TAG}" \
190195
--annotation-config azure-orbital-space-sdk-setup.yaml
191196
done
192197

0 commit comments

Comments
 (0)