Skip to content

Commit 2adb85e

Browse files
alexlianidesalianides
alexlianides
and
alianides
authored
0.11.0 Nightly updates (#111)
* update devcontainer.json and workflows to reference @0.11.0-nightly, updated triggers, updated image tag calcuations * updated image calcuations --------- Co-authored-by: alianides <alianides@microsoft.com>
1 parent 30ff9c0 commit 2adb85e

File tree

8 files changed

+33
-17
lines changed

8 files changed

+33
-17
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
}

‎.devcontainer/test-feature/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_test_do_not_use": {
10+
"ghcr.io/microsoft/azure-orbital-space-sdk/spacefx-dev:0.11.0_test_do_not_use-nightly": {
1111
"app_name": "spacesdk-setup",
1212
"app_type": "none",
1313
"extract_setup_files": "false"

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
push:
1313
branches:
1414
- main
15+
- '[0-9]*.[0-9]*.[0-9]*-nightly'
1516

1617

1718
env:
@@ -34,7 +35,7 @@ jobs:
3435
- name: Display Ubuntu version
3536
run: lsb_release -a
3637

37-
- 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
3839
with:
3940
env_file: ./env/spacefx.env
4041
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
@@ -55,6 +56,9 @@ jobs:
5556
# Copy the scripts ino the entry point for the devcontainer feature
5657
echo "Copying all files to /var/spacedev..."
5758
./.vscode/copy_to_spacedev.sh --output-dir ./.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup
59+
60+
SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}"
61+
[[ "${SPACEFX_CHANNEL}" != "stable" ]] && SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}-${SPACEFX_CHANNEL}"
5862
5963
echo "...Cleaning './.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup/chart/certs'..."
6064
# Remove the certs that might've been generated
@@ -66,9 +70,10 @@ jobs:
6670
echo "Building the devcontainer feature..."
6771
devcontainer features package --force-clean-output-folder ./.devcontainer/features --output-folder ./output/spacefx-dev
6872
73+
6974
# Push the devcontainer feature tarball to the registry
7075
echo "Pushing the devcontainer feature tarball to the registry..."
71-
oras push ${{ env.REGISTRY }}/${{ env.FEATURE }}:${SPACEFX_VERSION} \
76+
oras push ${{ env.REGISTRY }}/${{ env.FEATURE }}:${SPACEFX_VERSION_CHANNEL_TAG} \
7277
--config /dev/null:application/vnd.devcontainers \
7378
--annotation org.opencontainers.image.source=https://github.com/microsoft/azure-orbital-space-sdk-setup \
7479
${{ env.ARTIFACT_PATH }}:application/vnd.devcontainers.layer.v1+tar

‎.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: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
push:
66
branches:
77
- main
8+
- '[0-9]*.[0-9]*.[0-9]*-nightly'
89

910
jobs:
1011
build-spacefx-base-image-amd64:
@@ -14,13 +15,13 @@ jobs:
1415
packages: write
1516

1617
steps:
17-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
18+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
1819
with:
1920
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
2021
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
2122
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
2223

23-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@main
24+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@0.11.0-nightly
2425
with:
2526
docker-file: /var/spacedev/build/spacesdk-base/Dockerfile.spacesdk-base
2627
architecture: amd64
@@ -35,13 +36,13 @@ jobs:
3536
packages: write
3637

3738
steps:
38-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
39+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
3940
with:
4041
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
4142
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
4243
SETUP_REPO_URL: ${{ secrets.SETUP_REPO_URL }}
4344

44-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@main
45+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/run-build-container-image@0.11.0-nightly
4546
with:
4647
docker-file: ./build/spacesdk-base/Dockerfile.spacesdk-base
4748
architecture: arm64
@@ -57,7 +58,7 @@ jobs:
5758
packages: write
5859

5960
steps:
60-
- 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
6162
with:
6263
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
6364
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
@@ -106,7 +107,7 @@ jobs:
106107
packages: write
107108

108109
steps:
109-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
110+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
110111
with:
111112
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
112113
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
@@ -155,7 +156,7 @@ jobs:
155156
packages: write
156157

157158
steps:
158-
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@main
159+
- uses: microsoft/azure-orbital-space-sdk-github-actions/composite-actions/initialize@0.11.0-nightly
159160
with:
160161
GIT_HUB_USER_NAME: ${{ secrets.GIT_HUB_USER_NAME }}
161162
GIT_HUB_USER_TOKEN: ${{ secrets.GIT_HUB_USER_TOKEN }}
@@ -167,6 +168,9 @@ jobs:
167168
echo "Sourcing environment variables..."
168169
source ./env/spacefx.env
169170
171+
SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}"
172+
[[ "${SPACEFX_CHANNEL}" != "stable" ]] && SPACEFX_VERSION_CHANNEL_TAG="${SPACEFX_VERSION}-${SPACEFX_CHANNEL}"
173+
170174
# Build the SpaceSDK-Jetson-DeviceQuery Versions
171175
CUDA_VERSIONS=("11.4" "12.2")
172176
for i in "${!CUDA_VERSIONS[@]}"; do
@@ -178,6 +182,7 @@ jobs:
178182
--repo-dir ${PWD} \
179183
--no-spacefx-dev \
180184
--app-name spacesdk-jetson-devicequery \
185+
--build-arg SDK_VERSION="${SPACEFX_VERSION_CHANNEL_TAG}" \
181186
--annotation-config azure-orbital-space-sdk-setup.yaml
182187
183188
/var/spacedev/build/build_containerImage.sh \
@@ -187,6 +192,7 @@ jobs:
187192
--repo-dir ${PWD} \
188193
--no-spacefx-dev \
189194
--app-name spacesdk-jetson-devicequery \
195+
--build-arg SDK_VERSION="${SPACEFX_VERSION_CHANNEL_TAG}" \
190196
--annotation-config azure-orbital-space-sdk-setup.yaml
191197
done
192198

‎.github/workflows/test-setup.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ on:
99
type: string
1010
default: "26.1.3"
1111
pull_request:
12-
branches: [ main ]
12+
branches:
13+
- main
14+
- '[0-9]*.[0-9]*.[0-9]*-nightly'
1315

1416

1517
env:

‎tests/dev_cluster.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ echo "...running copy_to_spacedev.sh"
112112
# Copy the scripts ino the entry point for the devcontainer feature
113113
${WORKING_DIR}/.vscode/copy_to_spacedev.sh --output-dir ${WORKING_DIR}/.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup
114114

115+
source ${WORKING_DIR}/.devcontainer/features/spacefx-dev/azure-orbital-space-sdk-setup/env/spacefx.env
116+
[[ "${SPACEFX_CHANNEL}" != "stable" ]] && VERSION="${VERSION}-${SPACEFX_CHANNEL}"
117+
115118
echo "...building the devcontainer feature..."
116119
# Build the devcontainer feature
117120
devcontainer features package --force-clean-output-folder ${WORKING_DIR}/.devcontainer/features --output-folder ${WORKING_DIR}/output/spacefx-dev

0 commit comments

Comments
 (0)