From 4d373228f22d60a5219f67c67fa0be9ca6945297 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 17:58:55 +0100 Subject: [PATCH 01/34] Update 'README.md' --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d54b1f..32da058 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The project is on my [Gitea](https://git.fascinated.cc/Fascinated/beatsaber-overlay) now, but the repo will be kept in sync on GitHub.
The public url to view/use:
-Need help? Feel free to message me at: Fascinated#7668 +Need help? Feel free to message me on Discord: Fascinated#7668 or Matrix: @fascinated:matrix.fascinated.cc ## Usage From 67525b4cc781f407841f9f4a4c0266e797b30ed0 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 18:29:04 +0100 Subject: [PATCH 02/34] Update '.drone.yml' --- .drone.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3707cbb..da212ce 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,10 +46,11 @@ steps: - main settings: username: - from_secret: dockerhub_username + from_secret: repo_username password: - from_secret: dockerhub_password - repo: fascinated/beatsaber-overlay + from_secret: repo_password + repo: gitea.example.com/Fascinated/beatsaber-overlay:latest + #repo: fascinated/beatsaber-overlay tags: latest volumes: From 61afc1540912117d4a06cdb372a26e985f01ca6e Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 18:36:44 +0100 Subject: [PATCH 03/34] Add '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .gitea/workflows/publish.yaml diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml new file mode 100644 index 0000000..d021de8 --- /dev/null +++ b/.gitea/workflows/publish.yaml @@ -0,0 +1,30 @@ +name: ci + +on: + push: + branches: + - 'main' + +jobs: + docker: + runs-on: ubuntu-20.04 + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - + name: Login to REPO + uses: docker/login-action@v2 + with: + registry: git.fascinated.cc + username: ${{ secrets.REPO_USERNAME }} + password: ${{ secrets.REPO_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v4 + with: + push: true + tags: git.fascinated.cc/Fascinated/beatsaber-overlay:latest \ No newline at end of file From 78cb5874640478290107c9fd50ffc3352a3fd608 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 18:54:56 +0100 Subject: [PATCH 04/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index d021de8..6a52d1f 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -7,7 +7,7 @@ on: jobs: docker: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Set up QEMU From a0e7901feb99e1943fcbd14457019719ce71fd9f Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:05:53 +0100 Subject: [PATCH 05/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 6a52d1f..eb78ee5 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -8,22 +8,19 @@ on: jobs: docker: runs-on: ubuntu-latest + - uses: docker://node:alpine steps: - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Login to REPO + - name: Login to REPO uses: docker/login-action@v2 with: registry: git.fascinated.cc username: ${{ secrets.REPO_USERNAME }} password: ${{ secrets.REPO_TOKEN }} - - - name: Build and push + - name: Build and push uses: docker/build-push-action@v4 with: push: true From 03f8ef04de05ef17ec58044ca70f86eae3bcb1e6 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:08:11 +0100 Subject: [PATCH 06/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index eb78ee5..5bcb5cd 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -8,7 +8,7 @@ on: jobs: docker: runs-on: ubuntu-latest - - uses: docker://node:alpine + - uses: docker://node:19-alpine steps: - name: Set up QEMU uses: docker/setup-qemu-action@v2 From a2357c6469f539bc47afc7bc0deec5647d69099d Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:10:34 +0100 Subject: [PATCH 07/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 5bcb5cd..bbab22f 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -8,13 +8,13 @@ on: jobs: docker: runs-on: ubuntu-latest - - uses: docker://node:19-alpine + #- uses: docker://node:19-alpine steps: - name: Set up QEMU uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Login to REPO + - name: Login to Repo uses: docker/login-action@v2 with: registry: git.fascinated.cc From e12a6513cb5b43e387180456c970b4b68ab60f4c Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:10:49 +0100 Subject: [PATCH 08/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index bbab22f..07d52d2 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -8,7 +8,7 @@ on: jobs: docker: runs-on: ubuntu-latest - #- uses: docker://node:19-alpine + - uses: docker://node:19-alpine steps: - name: Set up QEMU uses: docker/setup-qemu-action@v2 From 42ff5305f5e0a191579eb9b390f4fffc2ebcfcd8 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:11:50 +0100 Subject: [PATCH 09/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 07d52d2..023465b 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -8,7 +8,7 @@ on: jobs: docker: runs-on: ubuntu-latest - - uses: docker://node:19-alpine + - uses: docker://node:18-alpine steps: - name: Set up QEMU uses: docker/setup-qemu-action@v2 From caa10915a87a8e43fb42d79dab6ab19084b6a06b Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:14:19 +0100 Subject: [PATCH 10/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 023465b..e43d31a 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -1,4 +1,4 @@ -name: ci +name: Publish on: push: @@ -8,12 +8,7 @@ on: jobs: docker: runs-on: ubuntu-latest - - uses: docker://node:18-alpine steps: - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - name: Login to Repo uses: docker/login-action@v2 with: @@ -24,4 +19,4 @@ jobs: uses: docker/build-push-action@v4 with: push: true - tags: git.fascinated.cc/Fascinated/beatsaber-overlay:latest \ No newline at end of file + tags: git.fascinated.cc/Fascinated/beatsaber-overlay:latest From a18a77d198765fab59dc49806532d9442d502df2 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:19:05 +0100 Subject: [PATCH 11/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index e43d31a..07f467c 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -8,6 +8,7 @@ on: jobs: docker: runs-on: ubuntu-latest + container: node:19-alpine steps: - name: Login to Repo uses: docker/login-action@v2 From cea026adb69c53d3d2c42b10a77e9df39ede313d Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:22:04 +0100 Subject: [PATCH 12/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 07f467c..9e385a9 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -7,7 +7,7 @@ on: jobs: docker: - runs-on: ubuntu-latest + runs-on: catthehacker/ubuntu:act-22.04 container: node:19-alpine steps: - name: Login to Repo From fa9b44aebd20b2a7baf5b80c96be938ff3d79a40 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:24:44 +0100 Subject: [PATCH 13/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 9e385a9..772c181 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -7,7 +7,7 @@ on: jobs: docker: - runs-on: catthehacker/ubuntu:act-22.04 + runs-on: catthehacker/ubuntu:act-latest container: node:19-alpine steps: - name: Login to Repo From cfdf052e255d526e359a9cda4a1f27f42e3240e0 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 19:35:37 +0100 Subject: [PATCH 14/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 772c181..729b6e3 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -10,6 +10,8 @@ jobs: runs-on: catthehacker/ubuntu:act-latest container: node:19-alpine steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Login to Repo uses: docker/login-action@v2 with: From b3a2a943e79f4f608c6ddc3d316f31d2dd87faee Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:18:25 +0100 Subject: [PATCH 15/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 729b6e3..c092117 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -7,7 +7,7 @@ on: jobs: docker: - runs-on: catthehacker/ubuntu:act-latest + runs-on: ubuntu-latest container: node:19-alpine steps: - name: Set up Docker Buildx From 7443e380332e4ef038ced694fffd7d0202e752f6 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:22:02 +0100 Subject: [PATCH 16/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index c092117..02c897d 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -10,6 +10,7 @@ jobs: runs-on: ubuntu-latest container: node:19-alpine steps: + - uses: actions/checkout@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to Repo From 7aa8724ba1fefc100154ccb64cf80a4c1e60cfc1 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:23:06 +0100 Subject: [PATCH 17/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 02c897d..a82c145 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -7,7 +7,12 @@ on: jobs: docker: - runs-on: ubuntu-latest + strategy: + matrix: + arch: ['ubuntu-latest', 'arm-ubuntu-latest'] + go-version: ['1.19','1.20'] + git-version: ['2.38.4'] + runs-on: ${{ matrix.arch }} container: node:19-alpine steps: - uses: actions/checkout@v3 From af7f5a6de2ce955ae0425f43b72c97f6f6925a8b Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:23:30 +0100 Subject: [PATCH 18/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index a82c145..39a6842 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -9,8 +9,8 @@ jobs: docker: strategy: matrix: - arch: ['ubuntu-latest', 'arm-ubuntu-latest'] - go-version: ['1.19','1.20'] + arch: ['ubuntu-latest'] + go-version: ['1.20'] git-version: ['2.38.4'] runs-on: ${{ matrix.arch }} container: node:19-alpine From 9f8f6001b8f46c2ee1a579099ed0b9d4cb883acf Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:25:22 +0100 Subject: [PATCH 19/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 39a6842..6d64386 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -10,7 +10,6 @@ jobs: strategy: matrix: arch: ['ubuntu-latest'] - go-version: ['1.20'] git-version: ['2.38.4'] runs-on: ${{ matrix.arch }} container: node:19-alpine From 7013bb4e095718dd943062afab7c68f2f6264287 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:33:41 +0100 Subject: [PATCH 20/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 6d64386..4af59ec 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ${{ matrix.arch }} container: node:19-alpine steps: - - uses: actions/checkout@v3 + #- uses: actions/checkout@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to Repo From 6eb3ead4c9feccc59880fbb32e10db327c5f2acf Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:34:52 +0100 Subject: [PATCH 21/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 4af59ec..285e9b7 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -14,7 +14,14 @@ jobs: runs-on: ${{ matrix.arch }} container: node:19-alpine steps: - #- uses: actions/checkout@v3 + - name: checkout + uses: https://github.com/actions/checkout@v3 + + - name: download docker + run: | + wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ + && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ + && rm -rf /tmp/* - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to Repo From 40c65e4d889e54e9666faa4ef87330ed520375c0 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:36:38 +0100 Subject: [PATCH 22/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 285e9b7..e28bd33 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -14,6 +14,10 @@ jobs: runs-on: ${{ matrix.arch }} container: node:19-alpine steps: + - name: install git + run: | + apt install git --assume-yes + - name: checkout uses: https://github.com/actions/checkout@v3 From 3e4c1ff43751e109127abfa9c20aec993da7b27b Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:38:28 +0100 Subject: [PATCH 23/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index e28bd33..7dca365 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -14,10 +14,6 @@ jobs: runs-on: ${{ matrix.arch }} container: node:19-alpine steps: - - name: install git - run: | - apt install git --assume-yes - - name: checkout uses: https://github.com/actions/checkout@v3 @@ -26,14 +22,17 @@ jobs: wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ && rm -rf /tmp/* + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Login to Repo uses: docker/login-action@v2 with: registry: git.fascinated.cc username: ${{ secrets.REPO_USERNAME }} password: ${{ secrets.REPO_TOKEN }} + - name: Build and push uses: docker/build-push-action@v4 with: From 8737f881459ba130a14856e13f67aeee0a8f00b1 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:43:26 +0100 Subject: [PATCH 24/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 7dca365..f1d9230 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -12,7 +12,7 @@ jobs: arch: ['ubuntu-latest'] git-version: ['2.38.4'] runs-on: ${{ matrix.arch }} - container: node:19-alpine + #container: node:19-alpine steps: - name: checkout uses: https://github.com/actions/checkout@v3 From f013d49c7ab427f092e93a1dd19919b595d36c12 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:45:14 +0100 Subject: [PATCH 25/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index f1d9230..49d41df 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -37,4 +37,4 @@ jobs: uses: docker/build-push-action@v4 with: push: true - tags: git.fascinated.cc/Fascinated/beatsaber-overlay:latest + tags: git.fascinated.cc/fascinated/beatsaber-overlay:latest From 8f86710cb603b0afd13e6cf3f446c476ff9f9558 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:56:46 +0100 Subject: [PATCH 26/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 49d41df..8746a0c 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -37,4 +37,5 @@ jobs: uses: docker/build-push-action@v4 with: push: true + context: . tags: git.fascinated.cc/fascinated/beatsaber-overlay:latest From 42192e7885b894ed385c1f4735483e04d48207a6 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:57:36 +0100 Subject: [PATCH 27/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 8746a0c..5129f17 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -17,11 +17,11 @@ jobs: - name: checkout uses: https://github.com/actions/checkout@v3 - - name: download docker - run: | - wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ - && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ - && rm -rf /tmp/* + #- name: download docker + # run: | + # wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ + # && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ + # && rm -rf /tmp/* - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 3b0f7e3ef22ebe8634746aff040fde3b4265a0ed Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 20:59:11 +0100 Subject: [PATCH 28/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 5129f17..8746a0c 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -17,11 +17,11 @@ jobs: - name: checkout uses: https://github.com/actions/checkout@v3 - #- name: download docker - # run: | - # wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ - # && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ - # && rm -rf /tmp/* + - name: download docker + run: | + wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ + && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ + && rm -rf /tmp/* - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 From 34c17ea16752810a74552cc2b1f008aa98795868 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 21:05:26 +0100 Subject: [PATCH 29/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 8746a0c..0f1e2fb 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -26,6 +26,14 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: Login to Repo uses: docker/login-action@v2 with: @@ -39,3 +47,10 @@ jobs: push: true context: . tags: git.fascinated.cc/fascinated/beatsaber-overlay:latest + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new + + - name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache From 190c19f23871925b543fbb6620dfe2b10f204d68 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 21:09:48 +0100 Subject: [PATCH 30/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 0f1e2fb..6ee64bc 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -17,7 +17,16 @@ jobs: - name: checkout uses: https://github.com/actions/checkout@v3 - - name: download docker + - name: Restore Docker + id: cache-docker + uses: actions/cache/restore@v3 + with: + path: | + /usr/bin/docker + key: ${{ runner.os }}-docker + + - name: Download docker + if: steps.cache-docker.outputs.cache-hit != 'true' run: | wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ From d84122da3a970419ba66e627c9f8c33f9643bf60 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 21:11:43 +0100 Subject: [PATCH 31/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 6ee64bc..0fb49c1 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -24,6 +24,7 @@ jobs: path: | /usr/bin/docker key: ${{ runner.os }}-docker + token: ${{ secrets.GITHUB_TOKEN }} - name: Download docker if: steps.cache-docker.outputs.cache-hit != 'true' From 23cd272c3cc4421b65ae1970c4616a161bcc4f54 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 21:13:13 +0100 Subject: [PATCH 32/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 0fb49c1..635ae5f 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -24,7 +24,7 @@ jobs: path: | /usr/bin/docker key: ${{ runner.os }}-docker - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_TOKEN }} - name: Download docker if: steps.cache-docker.outputs.cache-hit != 'true' From 35e2ccd402ff88ca84ca1cc13aae623a8f706c59 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 21:17:10 +0100 Subject: [PATCH 33/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 635ae5f..9872473 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -19,7 +19,7 @@ jobs: - name: Restore Docker id: cache-docker - uses: actions/cache/restore@v3 + uses: https://github.com/actions/cache/restore@v3 with: path: | /usr/bin/docker @@ -34,10 +34,10 @@ jobs: && rm -rf /tmp/* - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: https://github.com/docker/setup-buildx-action@v2 - name: Cache Docker layers - uses: actions/cache@v2 + uses: https://github.com/actions/cache@v2 with: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ github.sha }} @@ -45,7 +45,7 @@ jobs: ${{ runner.os }}-buildx- - name: Login to Repo - uses: docker/login-action@v2 + uses: https://github.com/docker/login-action@v2 with: registry: git.fascinated.cc username: ${{ secrets.REPO_USERNAME }} From b9bd7f8e8596eb897fcd3b3c1a2074ec831bb6f2 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 27 Mar 2023 22:00:45 +0100 Subject: [PATCH 34/34] Update '.gitea/workflows/publish.yaml' --- .gitea/workflows/publish.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 9872473..0622d41 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -9,7 +9,7 @@ jobs: docker: strategy: matrix: - arch: ['ubuntu-latest'] + arch: ['git.fascinated.cc/fascinated/gitea-runner:ubuntu-latest'] git-version: ['2.38.4'] runs-on: ${{ matrix.arch }} #container: node:19-alpine @@ -26,12 +26,12 @@ jobs: key: ${{ runner.os }}-docker token: ${{ secrets.GH_TOKEN }} - - name: Download docker - if: steps.cache-docker.outputs.cache-hit != 'true' - run: | - wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ - && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ - && rm -rf /tmp/* + #- name: Download docker + # if: steps.cache-docker.outputs.cache-hit != 'true' + # run: | + # wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ + # && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ + # && rm -rf /tmp/* - name: Set up Docker Buildx uses: https://github.com/docker/setup-buildx-action@v2