Skip to content

Commit 5950b22

Browse files
committed
Merge branch 'master' into fix_software_calibration
2 parents 93bad08 + 6f86cdc commit 5950b22

File tree

131 files changed

+555
-509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+555
-509
lines changed

Diff for: .github/workflows/image-builder-from-repo.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
run: |
9191
IMAGE=SD-card-image-${{ github.event.inputs.tags }}-${{ github.event.inputs.architecture }}
9292
cp ${{ env.workspace_dir }}/*.img $IMAGE.img
93-
echo "::set-output name=image::$IMAGE"
93+
echo "image=$IMAGE" >> $GITHUB_OUTPUT
9494
9595
# artifact upload will take care of zipping for us
9696
- uses: actions/upload-artifact@v1

Diff for: .github/workflows/image-builder.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
run: |
9292
IMAGE=SD-card-image-${{ github.event.inputs.tags }}-${{ github.event.inputs.architecture }}
9393
cp ${{ env.workspace_dir }}/*.img $IMAGE.img
94-
echo "::set-output name=image::$IMAGE"
94+
echo "image=$IMAGE" >> $GITHUB_OUTPUT
9595
9696
# artifact upload will take care of zipping for us
9797
- uses: actions/upload-artifact@v1

Diff for: .github/workflows/push-master.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
shell: cmake -P {0}
5252
run: |
5353
string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC)
54-
message("::set-output name=timestamp::${current_date}")
54+
file(APPEND "$ENV{GITHUB_OUTPUT}" "timestamp=${current_date}")
5555
5656
# download cache
5757
- name: ccache cache files
@@ -110,7 +110,7 @@ jobs:
110110
shell: cmake -P {0}
111111
run: |
112112
string(TIMESTAMP current_date "%Y-%m-%d-%H-%M-%S" UTC)
113-
message("::set-output name=timestamp::${current_date}")
113+
file(APPEND "$ENV{GITHUB_OUTPUT}" "timestamp=${current_date}")
114114
115115
# Download cache
116116
- name: ccache cache files
@@ -242,7 +242,7 @@ jobs:
242242

243243
# Download artifacts from previous build process
244244
- name: Download artifacts
245-
uses: actions/download-artifact@v2
245+
uses: actions/download-artifact@v3
246246
with:
247247
path: artifacts
248248

Diff for: assets/webconfig/css/bootstrap.min.css

-6
This file was deleted.

Diff for: assets/webconfig/js/lib/bootstrap.min.js

-7
This file was deleted.

Diff for: assets/webconfig/js/lib/dialog.min.js

-1
This file was deleted.

0 commit comments

Comments
 (0)