From e3874f09d466ec4af5344cbfbd4f3f3aece560bb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 2 Apr 2023 03:45:15 +0200 Subject: [PATCH 1/4] Bot Updating Templated Files --- Jenkinsfile | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fcc0916..f9d6145 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,7 +56,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' } script{ env.LS_RELEASE_NUMBER = sh( @@ -228,17 +228,14 @@ pipeline { } sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash''' sh '''#! /bin/bash - set -e - docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest docker run --rm \ - -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \ - -e FILE_NAME="shellcheck-result.xml" \ - -e MIMETYPE="text/xml" \ - -v ${WORKSPACE}:/mnt \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \ - python /upload.py''' + -v ${WORKSPACE}:/mnt \ + -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ + -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ + ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + apk add --no-cache py3-pip && \ + pip install s3cmd && \ + s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' } } } @@ -275,7 +272,7 @@ pipeline { echo "Jenkinsfile is up to date." fi # Stage 2 - Delete old templates - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -292,7 +289,7 @@ pipeline { git commit -m 'Bot Updating Templated Files' git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old templates" + echo "Deleting old and deprecated templates" rm -Rf ${TEMPDIR} exit 0 else From d3404c63cef21131fac989d54eadbfb4ea0e1eef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 2 Apr 2023 03:46:41 +0200 Subject: [PATCH 2/4] Bot Updating Templated Files --- .github/workflows/call_invalid_helper.yml | 12 ------------ .github/workflows/stale.yml | 23 ----------------------- 2 files changed, 35 deletions(-) delete mode 100644 .github/workflows/call_invalid_helper.yml delete mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml deleted file mode 100644 index 773767c..0000000 --- a/.github/workflows/call_invalid_helper.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Comment on invalid interaction -on: - issues: - types: - - labeled -jobs: - add-comment-on-invalid: - if: github.event.label.name == 'invalid' - permissions: - issues: write - uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1 - secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml deleted file mode 100644 index 73dfe45..0000000 --- a/.github/workflows/stale.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Mark stale issues and pull requests - -on: - schedule: - - cron: "30 1 * * *" - -jobs: - stale: - - runs-on: ubuntu-latest - - steps: - - uses: actions/stale@v6.0.1 - with: - stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions." - stale-issue-label: 'no-issue-activity' - stale-pr-label: 'no-pr-activity' - days-before-stale: 30 - days-before-close: 365 - exempt-issue-labels: 'awaiting-approval,work-in-progress' - exempt-pr-labels: 'awaiting-approval,work-in-progress' - repo-token: ${{ secrets.GITHUB_TOKEN }} From f48e9d519212097794ba380501eb27f794e6fff2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 2 Apr 2023 03:48:05 +0200 Subject: [PATCH 3/4] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 14 ++++++++++++++ .github/workflows/call_issues_cron.yml | 13 +++++++++++++ .github/workflows/package_trigger_scheduler.yml | 2 +- .github/workflows/permissions.yml | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100755 .github/workflows/call_issue_pr_tracker.yml create mode 100755 .github/workflows/call_issues_cron.yml diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml new file mode 100755 index 0000000..87243e2 --- /dev/null +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -0,0 +1,14 @@ +name: Issue & PR Tracker + +on: + issues: + types: [opened,reopened,labeled,unlabeled] + pull_request_target: + types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled] + +jobs: + manage-project: + permissions: + issues: write + uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 + secrets: inherit diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml new file mode 100755 index 0000000..529fe79 --- /dev/null +++ b/.github/workflows/call_issues_cron.yml @@ -0,0 +1,13 @@ +name: Mark stale issues and pull requests +on: + schedule: + - cron: '58 21 * * *' + workflow_dispatch: + +jobs: + stale: + permissions: + issues: write + pull-requests: write + uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1 + secrets: inherit diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 7bf56d4..62a7753 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -2,7 +2,7 @@ name: Package Trigger Scheduler on: schedule: - - cron: '03 7 * * 2' + - cron: '9 9 * * 3' workflow_dispatch: jobs: diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 2df6b61..1447bc5 100644 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -1,9 +1,10 @@ name: Permission check on: - pull_request: + pull_request_target: paths: - '**/run' - '**/finish' + - '**/check' jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 From eef01eed6fcbe8316f75c5c5143707914661b882 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 2 Apr 2023 03:52:54 +0200 Subject: [PATCH 4/4] Bot Updating Package Versions --- package_versions.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 316e523..312b865 100644 --- a/package_versions.txt +++ b/package_versions.txt @@ -4,7 +4,7 @@ NAME VE @socket.io/component-emitter 3.1.0 npm @types/cookie 0.4.1 npm @types/cors 2.8.13 npm -@types/node 18.15.5 npm +@types/node 18.15.11 npm accepts 1.3.8 npm alpine-baselayout 3.4.0-r0 apk alpine-baselayout-data 3.4.0-r0 apk @@ -38,7 +38,7 @@ cairo-gobject 1. call-bind 1.0.2 npm cdparanoia-libs 10.2-r11 apk chalk 4.1.2 npm -chromium 110.0.5481.177-r0 apk +chromium 111.0.5563.146-r1 apk cjson 1.7.15-r3 apk color-convert 2.0.1 npm color-name 1.1.4 npm @@ -74,8 +74,8 @@ escape-html 1. etag 1.8.1 npm eudev-libs 3.2.11-r4 apk express 4.18.2 npm -ffmpeg 5.1.2-r2 apk -ffmpeg-libs 5.1.2-r2 apk +ffmpeg 5.1.3-r0 apk +ffmpeg-libs 5.1.3-r0 apk fftw-single-libs 3.3.10-r1 apk file 5.43-r0 apk file-uri-to-path 1.0.0 npm @@ -360,7 +360,7 @@ libbsd 0. libbz2 1.0.8-r4 apk libc-utils 0.7.2-r3 apk libcap2 2.66-r0 apk -libcrypto3 3.0.8-r0 apk +libcrypto3 3.0.8-r1 apk libcurl 7.88.1-r1 apk libdav1d 1.0.0-r2 apk libdrm 2.4.114-r0 apk @@ -398,7 +398,7 @@ libsndfile 1. libsodium 1.0.18-r2 apk libsrt 1.5.1-r0 apk libssh 0.10.4-r0 apk -libssl3 3.0.8-r0 apk +libssl3 3.0.8-r1 apk libstdc++ 12.2.1_git20220924-r4 apk libtasn1 4.19.0-r0 apk libtheora 1.1.1-r16 apk @@ -495,7 +495,7 @@ openbox-libs 3. openssh-client-common 9.1_p1-r2 apk openssh-client-default 9.1_p1-r2 apk openssh-keygen 9.1_p1-r2 apk -openssl 3.0.8-r1 apk +openssl 3.0.8-r3 apk opus 1.3.1-r1 apk orc 0.4.33-r0 apk p11-kit 0.24.1-r1 apk @@ -537,7 +537,7 @@ range-parser 1. raw-body 2.5.1 npm re2 2022.06.01-r1 apk readline 8.2.0-r0 apk -runc 1.1.4-r5 apk +runc 1.1.5-r0 apk safe-buffer 5.2.1 npm safer-buffer 2.1.2 npm scanelf 1.3.5-r1 apk @@ -568,11 +568,11 @@ supports-color 7. svt-av1-libs 1.3.0-r0 apk tar 1.34-r2 apk tdb-libs 1.4.7-r0 apk -tiff 4.4.0-r2 apk +tiff 4.4.0-r3 apk tini-static 0.19.0-r1 apk toidentifier 1.0.1 npm type-is 1.6.18 npm -tzdata 2022f-r1 apk +tzdata 2023b-r1 apk unpipe 1.0.0 npm utils-merge 1.0.1 npm utmps-libs 0.1.2.0-r1 apk