From 2531d71274aa3386c15ec581311740119ea53c41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Tue, 10 Jan 2023 19:01:22 +0100 Subject: [PATCH 01/12] use ubuntu-latest for non building machines --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92983a5c..e7a5a5e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ on: jobs: prepare_jobs: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest container: node:lts steps: - uses: actions/checkout@v3 @@ -103,7 +103,7 @@ jobs: path: ${{ env.PACKAGE }}/*.tar.xz upload-releases: needs: [prepare_jobs, build, build_depends] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 From 170d21df7c015c3f9e6340148c59a665884c76de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Tue, 10 Jan 2023 19:06:41 +0100 Subject: [PATCH 02/12] use vitasdk docker image to build --- .github/workflows/build.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e7a5a5e7..ff93c2c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,8 @@ jobs: build: needs: [prepare_jobs] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest + container: vitasdk/vitasdk:latest strategy: fail-fast: false matrix: @@ -35,13 +36,6 @@ jobs: TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v3 - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install fakeroot cmake cmake-data texinfo libtool-bin libarchive-tools - - name: Prepare Build - run: | - bash ./prepare.sh - name: Build package run: | export VITASDK=/usr/local/vitasdk @@ -57,7 +51,8 @@ jobs: path: ${{ matrix.package }}/*.tar.xz build_depends: needs: [prepare_jobs, build] - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest + container: vitasdk/vitasdk:latest strategy: fail-fast: false matrix: @@ -69,13 +64,6 @@ jobs: steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install fakeroot cmake cmake-data texinfo libtool-bin libarchive-tools pkg-config libc6-dev-i386 - - name: Prepare Build - run: | - bash ./prepare.sh - name: Install packages run: | export VITASDK=/usr/local/vitasdk From 778c27615e6580dbbafb5a8e9632e6a86cf302a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Thu, 12 Jan 2023 20:11:38 +0100 Subject: [PATCH 03/12] use non root user --- .github/workflows/build.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ff93c2c1..bb69ae57 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,9 +38,8 @@ jobs: - uses: actions/checkout@v3 - name: Build package run: | - export VITASDK=/usr/local/vitasdk - export PATH=$(pwd)/../vita-makepkg:$VITASDK/bin:$PATH - bash ./build.sh ${{ matrix.package }} + chown -R user . + su user -c 'bash ./build.sh ${{ matrix.package }}' - name: Rename package run: | export FILE=`echo ${{ matrix.package }}/*-arm.tar.xz` @@ -73,9 +72,8 @@ jobs: cd .. - name: Build packages run: | - export VITASDK=/usr/local/vitasdk - export PATH=$(pwd)/../vita-makepkg:$VITASDK/bin:$PATH - for f in ${{ matrix.package }}; do bash ./build.sh $f; done + chown -R user . + for f in ${{ matrix.package }}; do su user -c 'bash ./build.sh $f'; done - name: Upload package run: | export PACKAGE=`echo ${{ matrix.package }} | awk '{print $NF}'` From 9ccc23ae1551ec5724214ca5894c819473b8702d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Thu, 12 Jan 2023 20:17:01 +0100 Subject: [PATCH 04/12] add git dependency --- .github/workflows/build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bb69ae57..442adc54 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,6 +35,9 @@ jobs: SSHPASS: ${{ secrets.SSHPASS }} TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: + - name: Install dependencies + run: | + apk add git - uses: actions/checkout@v3 - name: Build package run: | @@ -61,6 +64,9 @@ jobs: SSHPASS: ${{ secrets.SSHPASS }} TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: + - name: Install dependencies + run: | + apk add git - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - name: Install packages From 55e27c467adee796392a38346dc61d412925579e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Thu, 12 Jan 2023 20:23:09 +0100 Subject: [PATCH 05/12] add more dependencies --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 442adc54..40fe708a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git + apk add git autoconf automake patch - uses: actions/checkout@v3 - name: Build package run: | @@ -66,7 +66,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git + apk add git autoconf automake patch - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - name: Install packages From 9349194cc3f07f44432c6ff52f9ca539ff6ee971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Thu, 12 Jan 2023 20:44:35 +0100 Subject: [PATCH 06/12] more dependencies --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40fe708a..25a9df64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch + apk add git autoconf automake patch libtool gcc g++ musl-dev - uses: actions/checkout@v3 - name: Build package run: | @@ -66,7 +66,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch + apk add git autoconf automake patch libtool gcc g++ musl-dev - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - name: Install packages From ef66c9405a8f380dea38adc338d6fffa8d686ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Thu, 12 Jan 2023 20:56:49 +0100 Subject: [PATCH 07/12] more dependencies --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 25a9df64..50205457 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch libtool gcc g++ musl-dev + apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo - uses: actions/checkout@v3 - name: Build package run: | @@ -66,7 +66,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch libtool gcc g++ musl-dev + apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - name: Install packages From cd44dfe4b9db82b7a834e9acde9511363202b862 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Thu, 12 Jan 2023 23:45:50 +0100 Subject: [PATCH 08/12] more dependencies --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50205457..051e147c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,7 +37,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo + apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo diffutils gcompat - uses: actions/checkout@v3 - name: Build package run: | @@ -66,7 +66,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo + apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo diffutils gcompat - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - name: Install packages From 6af1b4d8e3b71cae646942bfd2463f461421a1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Fri, 13 Jan 2023 17:27:24 +0100 Subject: [PATCH 09/12] No need to export VITASDK --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 051e147c..f7dc6b58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,8 +71,6 @@ jobs: - uses: actions/download-artifact@v3 - name: Install packages run: | - export VITASDK=/usr/local/vitasdk - export PATH=$(pwd)/../vita-makepkg:$VITASDK/bin:$PATH cd package for f in *.tar.xz; do tar -C $VITASDK/arm-vita-eabi/ -xvf "$f"; done cd .. From 813d482c6601dc6649d871c5830a5fbb76e564e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Fri, 13 Jan 2023 18:38:41 +0100 Subject: [PATCH 10/12] fix build multiple packages --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f7dc6b58..a36412cd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,7 +77,7 @@ jobs: - name: Build packages run: | chown -R user . - for f in ${{ matrix.package }}; do su user -c 'bash ./build.sh $f'; done + su user -c 'for f in ${{ matrix.package }}; do bash ./build.sh $f; done' - name: Upload package run: | export PACKAGE=`echo ${{ matrix.package }} | awk '{print $NF}'` From 4916f4cff4c95d9413c5bfd8968ba44f53771c69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Fri, 13 Jan 2023 19:44:37 +0100 Subject: [PATCH 11/12] chown VITASDK to user --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a36412cd..62d8f9e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,6 +77,7 @@ jobs: - name: Build packages run: | chown -R user . + chown -R user $VITASDK su user -c 'for f in ${{ matrix.package }}; do bash ./build.sh $f; done' - name: Upload package run: | From 652a9a9cea1b0373002ac08fa9e1173316585638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Jos=C3=A9=20Garc=C3=ADa=20Garc=C3=ADa?= Date: Sat, 14 Jan 2023 10:36:34 +0100 Subject: [PATCH 12/12] use buildscripts image --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62d8f9e1..be9c992e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: build: needs: [prepare_jobs] runs-on: ubuntu-latest - container: vitasdk/vitasdk:latest + container: vitasdk/buildscripts:latest strategy: fail-fast: false matrix: @@ -37,7 +37,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo diffutils gcompat + apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo diffutils gcompat make bash fakeroot pkgconf curl fakeroot libarchive-tools file xz cmake python3 && ln -sf python3 /usr/bin/python - uses: actions/checkout@v3 - name: Build package run: | @@ -54,7 +54,7 @@ jobs: build_depends: needs: [prepare_jobs, build] runs-on: ubuntu-latest - container: vitasdk/vitasdk:latest + container: vitasdk/buildscripts:latest strategy: fail-fast: false matrix: @@ -66,7 +66,7 @@ jobs: steps: - name: Install dependencies run: | - apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo diffutils gcompat + apk add git autoconf automake patch libtool gcc g++ musl-dev subversion makedepend texinfo diffutils gcompat make bash fakeroot pkgconf curl fakeroot libarchive-tools file xz cmake python3 && ln -sf python3 /usr/bin/python - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 - name: Install packages