Skip to content

Commit 61390ec

Browse files
authored
Merge branch 'main' into casio-weather
2 parents 1ebce84 + de87a0d commit 61390ec

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/format.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
run: tests/test-format.sh
3030

3131
- name: Upload patches
32-
uses: actions/upload-artifact@v3
32+
uses: actions/upload-artifact@v4
3333
if: failure()
3434
with:
3535
name: Patches

.github/workflows/main.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -52,22 +52,22 @@ jobs:
5252
ref_name: ${{ github.head_ref || github.ref_name }}
5353
run: echo "REF_NAME=${ref_name//\//-}" >> $GITHUB_ENV
5454
- name: Upload DFU artifacts
55-
uses: actions/upload-artifact@v3
55+
uses: actions/upload-artifact@v4
5656
with:
5757
name: InfiniTime DFU ${{ env.REF_NAME }}
5858
path: ./build/output/pinetime-mcuboot-app-dfu/*
5959
- name: Upload MCUBoot image artifacts
60-
uses: actions/upload-artifact@v3
60+
uses: actions/upload-artifact@v4
6161
with:
6262
name: InfiniTime MCUBoot image ${{ env.REF_NAME }}
6363
path: ./build/output/pinetime-mcuboot-app-image-*.bin
6464
- name: Upload standalone ELF artifacts
65-
uses: actions/upload-artifact@v3
65+
uses: actions/upload-artifact@v4
6666
with:
6767
name: InfiniTime image ${{ env.REF_NAME }}
6868
path: ./build/output/src/pinetime-app-*.out
6969
- name: Upload resources artifacts
70-
uses: actions/upload-artifact@v3
70+
uses: actions/upload-artifact@v4
7171
with:
7272
name: InfiniTime resources ${{ env.REF_NAME }}
7373
path: ./build/output/infinitime-resources-*.zip
@@ -108,7 +108,7 @@ jobs:
108108
cmake --build build_lv_sim
109109
110110
- name: Upload simulator executable
111-
uses: actions/upload-artifact@v3
111+
uses: actions/upload-artifact@v4
112112
with:
113113
name: infinisim-${{ env.REF_NAME }}
114114
path: build_lv_sim/infinisim
@@ -208,7 +208,7 @@ jobs:
208208
EOF
209209
210210
- name: Upload comment
211-
uses: actions/upload-artifact@v3
211+
uses: actions/upload-artifact@v4
212212
with:
213213
name: comment
214214
path: comment

0 commit comments

Comments
 (0)