Skip to content

Commit db3a7cb

Browse files
[READY] - openwrt build follow up and github actions (#817)
2 parents dcb8f2f + 03b364e commit db3a7cb

File tree

4 files changed

+37
-7
lines changed

4 files changed

+37
-7
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
## Description
22

3+
<!--
34
Brief description of the Issue
5+
-->
46

57
## Acceptance Criteria
68

9+
<!--
710
What is the expected outcome that resolves this issue?
11+
-->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,31 @@
11
## Description of PR
22

3-
Brief description of the PR
3+
<!--
4+
Brief description of the changes in PR
5+
6+
If change is related to an open issue template include at the top of your
7+
description.
8+
-->
49

510
## Previous Behavior
611

12+
<!--
13+
What was the behavior before this PR?
14+
715
Remove this section if not relevant
16+
-->
817

918
## New Behavior
1019

20+
<!--
21+
What is the new behavior being introduced in this PR?
22+
1123
Remove this section if not relevant
24+
-->
1225

1326
## Tests
1427

15-
How was this PR tested?
28+
<!--
29+
How was this PR tested? Please provide as much detail as possible
30+
so we can ensure this change is working as intended before being merged.
31+
-->

.github/workflows/openwrt-build.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
container:
1515
# Ubuntu 24.04
1616
image: sarcasticadmin/openwrt-build@sha256:25ac9d0dd4eeaad1aaaa7c82c09e9ecc103c69224fc55eb9717c4cfb018a5281
17-
# Since user is ubuntu and gets 1000 from inside container
18-
options: --user 1000
17+
# Since user is openwrt and gets 1001 from inside container
18+
options: --user 1001
1919
steps:
2020
- uses: actions/checkout@v1
2121
with:
@@ -28,18 +28,28 @@ jobs:
2828
cd openwrt
2929
TARGET=${{ matrix.target }} make templates build-img package 2>&1 | tee ${{ matrix.target }}-build.log
3030
- name: 'Upload openwrt build artifact tarball'
31-
uses: actions/upload-artifact@v3.1.1
31+
uses: actions/upload-artifact@v4.6.0
3232
with:
3333
name: ${{ matrix.target }}-openwrt-build-artifacts
3434
# Cant use relative pathing .. or . for artifacts action
3535
# Also dont bother with '${{ github.workspace }}'
3636
path: |
3737
openwrt/build/artifacts/*.tar.gz
3838
retention-days: 30
39+
# Since we cant turn off compression set to lowest level
40+
compression-level: 0
41+
# rerunning jobs overwrites artifacts from previous runs
42+
# this was the default behavior in v3.x
43+
# ref: https://github.com/actions/upload-artifact/blob/v3.1.1/README.md?plain=1#L152
44+
overwrite: true
45+
# if we dont have images, scream loudly
46+
if-no-files-found: "error"
3947
- name: 'Upload openwrt build log'
40-
uses: actions/upload-artifact@v3.1.1
48+
uses: actions/upload-artifact@v4.6.0
4149
with:
4250
name: ${{ matrix.target }}-openwrt-buildlog
4351
path: |
4452
openwrt/*build.log
4553
retention-days: 30
54+
overwrite: true
55+
if-no-files-found: "error"

.github/workflows/trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# is not a PR event
3030
REF=$(curl -sSf \
3131
--url ${{ steps.pr-standardize-comment.outputs.url }} \
32-
--header 'Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}' \
32+
--header 'Authorization: Bearer ${{ secrets.SCALE_GITHUB_TOKEN }}' \
3333
--header 'Content-Type: application/json' | jq -r '.head.ref' \
3434
)
3535
echo "subcomm=$SUBCOMM" >> $GITHUB_OUTPUT

0 commit comments

Comments
 (0)