Skip to content
This repository was archived by the owner on Nov 10, 2023. It is now read-only.

Commit 9e02dad

Browse files
thespadthespad
committed
Fix armhf build options
1 parent a157596 commit 9e02dad

15 files changed

+353
-192
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
1515
indent_style = space
1616
indent_size = 2
1717

18-
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
18+
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
1919
indent_style = space
2020
indent_size = 4

‎.github/ISSUE_TEMPLATE/issue.bug.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Based on the issue template
2+
name: Bug report
3+
description: Create a report to help us improve
4+
title: "[BUG] <title>"
5+
labels: [Bug]
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Is there an existing issue for this?
10+
description: Please search to see if an issue already exists for the bug you encountered.
11+
options:
12+
- label: I have searched the existing issues
13+
required: true
14+
- type: textarea
15+
attributes:
16+
label: Current Behavior
17+
description: Tell us what happens instead of the expected behavior.
18+
validations:
19+
required: true
20+
- type: textarea
21+
attributes:
22+
label: Expected Behavior
23+
description: Tell us what should happen.
24+
validations:
25+
required: false
26+
- type: textarea
27+
attributes:
28+
label: Steps To Reproduce
29+
description: Steps to reproduce the behavior.
30+
placeholder: |
31+
1. In this environment...
32+
2. With this config...
33+
3. Run '...'
34+
4. See error...
35+
validations:
36+
required: true
37+
- type: textarea
38+
attributes:
39+
label: Environment
40+
description: |
41+
examples:
42+
- **OS**: Ubuntu 20.04
43+
- **How docker service was installed**: distro's packagemanager
44+
value: |
45+
- OS:
46+
- How docker service was installed:
47+
render: markdown
48+
validations:
49+
required: false
50+
- type: dropdown
51+
attributes:
52+
label: CPU architecture
53+
options:
54+
- x86-64
55+
- arm64
56+
validations:
57+
required: true
58+
- type: textarea
59+
attributes:
60+
label: Docker creation
61+
description: |
62+
Command used to create docker container
63+
Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
64+
render: bash
65+
validations:
66+
required: true
67+
- type: textarea
68+
attributes:
69+
description: |
70+
Provide a full docker log, output of "docker logs linuxserver.io"
71+
label: Container logs
72+
placeholder: |
73+
Output of `docker logs linuxserver.io`
74+
render: bash
75+
validations:
76+
required: true

‎.github/ISSUE_TEMPLATE/issue.feature.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Based on the issue template
2+
name: Feature request
3+
description: Suggest an idea for this project
4+
title: "[FEAT] <title>"
5+
labels: [enhancement]
6+
body:
7+
- type: checkboxes
8+
attributes:
9+
label: Is this a new feature request?
10+
description: Please search to see if a feature request already exists.
11+
options:
12+
- label: I have searched the existing issues
13+
required: true
14+
- type: textarea
15+
attributes:
16+
label: Wanted change
17+
description: Tell us what you want to happen.
18+
validations:
19+
required: true
20+
- type: textarea
21+
attributes:
22+
label: Reason for change
23+
description: Justify your request, why do you want it, what is the benefit.
24+
validations:
25+
required: true
26+
- type: textarea
27+
attributes:
28+
label: Proposed code change
29+
description: Do you have a potential code change in mind?
30+
validations:
31+
required: false

‎.github/workflows/call_issue_pr_tracker.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Issue & PR Tracker
2+
3+
on:
4+
issues:
5+
types: [opened,reopened,labeled,unlabeled,closed]
6+
pull_request_target:
7+
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
8+
pull_request_review:
9+
types: [submitted,edited,dismissed]
10+
11+
jobs:
12+
manage-project:
13+
permissions:
14+
issues: write
15+
uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
16+
secrets: inherit

‎.github/workflows/call_issues_cron.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Mark stale issues and pull requests
2+
on:
3+
schedule:
4+
- cron: '23 15 * * *'
5+
workflow_dispatch:
6+
7+
jobs:
8+
stale:
9+
permissions:
10+
issues: write
11+
pull-requests: write
12+
uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
13+
secrets: inherit

‎.github/workflows/external_trigger.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ jobs:
77
external-trigger-master:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2.3.3
10+
- uses: actions/checkout@v3.1.0
1111

1212
- name: External Trigger
1313
if: github.ref == 'refs/heads/master'
1414
run: |
1515
echo "**** No external release, exiting ****"
16+
echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY
1617
exit 0

‎.github/workflows/external_trigger_scheduler.yml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,44 @@ name: External Trigger Scheduler
22

33
on:
44
schedule:
5-
- cron: '43 * * * *'
5+
- cron: '7 * * * *'
66
workflow_dispatch:
77

88
jobs:
99
external-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2.3.3
12+
- uses: actions/checkout@v3.1.0
1313
with:
1414
fetch-depth: '0'
1515

1616
- name: External Trigger Scheduler
1717
run: |
1818
echo "**** Branches found: ****"
1919
git for-each-ref --format='%(refname:short)' refs/remotes
20-
echo "**** Pulling the yq docker image ****"
21-
docker pull ghcr.io/linuxserver/yq
2220
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
2321
do
2422
br=$(echo "$br" | sed 's|origin/||g')
2523
echo "**** Evaluating branch ${br} ****"
26-
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/jenkins-vars.yml \
27-
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
28-
if [ "$br" == "$ls_branch" ]; then
29-
echo "**** Branch ${br} appears to be live; checking workflow. ****"
24+
ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/jenkins-vars.yml)
25+
ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
26+
ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
27+
if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
28+
echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
3029
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
3130
echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
31+
echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
3232
curl -iX POST \
3333
-H "Authorization: token ${{ secrets.CR_PAT }}" \
3434
-H "Accept: application/vnd.github.v3+json" \
3535
-d "{\"ref\":\"refs/heads/${br}\"}" \
3636
https://api.github.com/repos/linuxserver/docker-gmail-order-bot/actions/workflows/external_trigger.yml/dispatches
3737
else
3838
echo "**** Workflow doesn't exist; skipping trigger. ****"
39+
echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
3940
fi
4041
else
41-
echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
42+
echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
43+
echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
4244
fi
4345
done

‎.github/workflows/greetings.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ jobs:
88
steps:
99
- uses: actions/first-interaction@v1
1010
with:
11-
issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/lsiodev/docker-gmail-order-bot/blob/master/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/lsiodev/docker-gmail-order-bot/blob/master/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
11+
issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
1212
pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/lsiodev/docker-gmail-order-bot/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/package_trigger.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,23 @@ jobs:
77
package-trigger-master:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v2.3.3
10+
- uses: actions/checkout@v3.1.0
1111

1212
- name: Package Trigger
1313
if: github.ref == 'refs/heads/master'
1414
run: |
1515
if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER }}" ]; then
1616
echo "**** Github secret PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER is set; skipping trigger. ****"
17+
echo "Github secret \`PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
1718
exit 0
1819
fi
1920
if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-gmail-order-bot/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
2021
echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
22+
echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
2123
exit 0
2224
fi
2325
echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER\". ****"
26+
echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_GMAIL_ORDER_BOT_MASTER\`" >> $GITHUB_STEP_SUMMARY
2427
response=$(curl -iX POST \
2528
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-gmail-order-bot/job/master/buildWithParameters?PACKAGE_CHECK=true \
2629
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
@@ -30,6 +33,7 @@ jobs:
3033
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
3134
buildurl="${buildurl%$'\r'}"
3235
echo "**** Jenkins job build url: ${buildurl} ****"
36+
echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
3337
echo "**** Attempting to change the Jenkins job description ****"
3438
curl -iX POST \
3539
"${buildurl}submitDescription" \

‎.github/workflows/package_trigger_scheduler.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,31 @@ name: Package Trigger Scheduler
22

33
on:
44
schedule:
5-
- cron: '32 11 * * 0'
5+
- cron: '41 22 * * 2'
66
workflow_dispatch:
77

88
jobs:
99
package-trigger-scheduler:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v2.3.3
12+
- uses: actions/checkout@v3.1.0
1313
with:
1414
fetch-depth: '0'
1515

1616
- name: Package Trigger Scheduler
1717
run: |
1818
echo "**** Branches found: ****"
1919
git for-each-ref --format='%(refname:short)' refs/remotes
20-
echo "**** Pulling the yq docker image ****"
21-
docker pull ghcr.io/linuxserver/yq
2220
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
2321
do
2422
br=$(echo "$br" | sed 's|origin/||g')
2523
echo "**** Evaluating branch ${br} ****"
26-
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/jenkins-vars.yml \
27-
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
24+
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/jenkins-vars.yml | yq -r '.ls_branch')
2825
if [ "${br}" == "${ls_branch}" ]; then
2926
echo "**** Branch ${br} appears to be live; checking workflow. ****"
3027
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-gmail-order-bot/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
3128
echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
29+
echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
3230
triggered_branches="${triggered_branches}${br} "
3331
curl -iX POST \
3432
-H "Authorization: token ${{ secrets.CR_PAT }}" \
@@ -38,9 +36,11 @@ jobs:
3836
sleep 30
3937
else
4038
echo "**** Workflow doesn't exist; skipping trigger. ****"
39+
echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
4140
fi
4241
else
4342
echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
43+
echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
4444
fi
4545
done
4646
echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"

0 commit comments

Comments
 (0)