pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-26 01:52:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Re-add missing files (#3873)

Browse Source
This commit is contained in:
Thomas Göttgens 2024-05-13 11:45:22 +02:00 committed by GitHub
parent 4d8c98c23d
commit 078f33ff78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/workflows/main_matrix.yml vendored
View File

@ -157,14 +157,13 @@ jobs:
with: with:
username: meshtastic username: meshtastic
password: ${{ secrets.DOCKER_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
- name: Docker setup - name: Docker setup
if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }} if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v3
- name: Docker build and push tagged versions - name: Docker build and push tagged versions
if: ${{ github.event_name == 'workflow_dispatch' }} if: ${{ github.event_name == 'workflow_dispatch' }}
uses: docker/build-push-action@v3 uses: docker/build-push-action@v5
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
@ -173,7 +172,7 @@ jobs:
- name: Docker build and push - name: Docker build and push
if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }} if: ${{ github.ref == 'refs/heads/master' && github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
uses: docker/build-push-action@v3 uses: docker/build-push-action@v5
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
@ -225,6 +224,9 @@ jobs:
run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT run: echo "version=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
id: version id: version
- name: Move files up
run: mv -b -t ./ ./release/meshtasticd_linux_aarch64 ./bin/config-dist.yaml
- name: Repackage in single firmware zip - name: Repackage in single firmware zip
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
@ -236,8 +238,11 @@ jobs:
./firmware-*-ota.zip ./firmware-*-ota.zip
./device-*.sh ./device-*.sh
./device-*.bat ./device-*.bat
./meshtasticd_linux_arm64 ./meshtasticd_linux_*64
./config-dist.yaml ./config-dist.yaml
./littlefs-*.bin
./bleota*bin
./Meshtastic_nRF52_factory_erase*.uf2
retention-days: 90 retention-days: 90
- uses: actions/download-artifact@v4 - uses: actions/download-artifact@v4
@ -378,7 +383,7 @@ jobs:
bin/bump_version.py bin/bump_version.py
- name: Create version.properties pull request - name: Create version.properties pull request
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v6
with: with:
add-paths: | add-paths: |
version.properties version.properties

2
.github/workflows/update_protobufs.yml vendored
View File

@ -26,7 +26,7 @@ jobs:
./bin/regen-protos.sh ./bin/regen-protos.sh
- name: Create pull request - name: Create pull request
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v6
with: with:
add-paths: | add-paths: |
protobufs protobufs