diff --git a/.gitignore b/.gitignore index 026b325..dd1fa6a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ BL_proxy/ *.blend1 +videos/vids 2 big/ diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 7481b91..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,74 +0,0 @@ -pipeline { - agent any - - environment { - JENKINSONGITEA=credentials('d0e86441-2157-405f-8539-a9a9010c6ecf') - JENKINSONMATRIXTOKEN=credentials('17d18fd7-29eb-4957-9532-ce42aaa9b4ec') - MATRIX_ROOMID="!BYVkHJUKqqLQbwGBzF:greyn.club" - GITEA_PROJECT="https://gitea.arg.rip/beefhavers/hunting-the-hyperlitigator" - } - stages { - stage('meta: avatar'){ - when { changeset "metadata/avatar.png"} - steps { - script{ - env.avatar=sh(returnStdout: true, script: "base64 metadata/avatar.png"); - //to gitea - sh(returnStdout: true, script: """ - echo "{\\"image\\": \\"\$(base64 --wrap=0 metadata/avatar.png)\\"}" > post.json - - curl -X 'POST' \ - 'https://gitea.arg.rip/api/v1/repos/beefhavers/hunting-the-hyperlitigator/avatar' \ - -H 'accept: application/json' \ - -H 'Authorization: token ${env.JENKINSONGITEA}' \ - -H 'Content-Type: application/json' \ - --data-binary @post.json - - rm post.json - """) - - //to matrix - env.avatarMXC=sh(returnStdout: true, script: """ - url="https://greyn.club:8448/_matrix/media/v3/upload"'?'"filename=hunting-the-hyperlitigator-avatar-\$(mktemp -u XXX).png" - curl "\$url" \ - -X 'POST' \ - -H 'authorization: Bearer ${env.JENKINSONMATRIXTOKEN}' \ - -H 'Content-Type: image/png' \ - --compressed \ - --data-binary @metadata/avatar.png \ - | jq -r .content_uri - """).trim() - - sh(returnStdout: true, script: """ - curl -X 'PUT' \ - 'https://greyn.club:8448/_matrix/client/v3/rooms/${env.MATRIX_ROOMID}/state/m.room.avatar' \ - -H 'accept: application/json' \ - -H 'authorization: Bearer ${env.JENKINSONMATRIXTOKEN}' \ - -H 'Content-Type: application/json' \ - -d '{ - "url": "${env.avatarMXC}" - }' - """) - } - } - } - stage('script'){ - when { changeset "src/script.md"} - steps { - sh "/home/adam/beef-kafka-script.sh hunting-the-hyperlitigator" - } - } - stage('credits'){ - when { changeset "src/credits.txt"} - steps { - sh "/home/adam/beef-kafka-credits.sh hunting-the-hyperlitigator" - } - } - stage('blend'){ - when { changeset "video.blend"} - steps { - sh "/home/adam/beef-kafka-video.sh hunting-the-hyperlitigator" - } - } - } -} diff --git a/Pictures/bill emerson food act.png b/Pictures/bill emerson food act.png new file mode 100644 index 0000000..808251f Binary files /dev/null and b/Pictures/bill emerson food act.png differ diff --git a/Pictures/california prop 65.jpg b/Pictures/california prop 65.jpg new file mode 100644 index 0000000..81c21a7 Binary files /dev/null and b/Pictures/california prop 65.jpg differ diff --git a/Pictures/jubel vs blue apron.png b/Pictures/jubel vs blue apron.png new file mode 100644 index 0000000..14cc56b Binary files /dev/null and b/Pictures/jubel vs blue apron.png differ diff --git a/src/credits.txt b/src/credits.txt index 172414a..5a963e4 100644 --- a/src/credits.txt +++ b/src/credits.txt @@ -17,4 +17,5 @@ https://wiki.warframe.com/w/User_blog:FINNER/Warframe_Expected_%26_Nearly_Guaran https://www.youtube.com/watch?v=P7UaY9j-ek0&t=121s; [yt]/@Berserkerkitten; Warframe Level 100 Tyl Regor Assassination (Energy Reduction) https://wiki.warframe.com/w/Sortie; Warframe WIKI; Sortie https://en.wikipedia.org/wiki/Expected_value; Wikipedia; Expected value -https://en.wikipedia.org/wiki/Expected_value#/media/File:Largenumbers.svg; NYKevin - Own work; An illustration of the convergence of sequence averages of rolls of a dice to the expected value of 3.5 as the number of rolls (trials) grows \ No newline at end of file +https://en.wikipedia.org/wiki/Expected_value#/media/File:Largenumbers.svg; NYKevin - Own work; An illustration of the convergence of sequence averages of rolls of a dice to the expected value of 3.5 as the number of rolls (trials) grows +https://www.govinfo.gov/content/pkg/PLAW-104publ210/html/PLAW-104publ210.htm \ No newline at end of file diff --git a/video.blend b/video.blend index 7567f6d..96c152b 100644 Binary files a/video.blend and b/video.blend differ