From 1eabefde636519d650f38b580c76973ddbb76278 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:43:08 +0200 Subject: [PATCH 1/7] Fix runtime --- .github/workflows/build.yml | 44 ++++++++++++++++++++++--------------- .github/workflows/test.yml | 20 ----------------- 2 files changed, 26 insertions(+), 38 deletions(-) delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2be8ee9..df122cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,35 +5,43 @@ on: workflow_dispatch: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest + container: + image: debian:bookworm steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 + with: + path: runtime_source - name: Fetching Build Tools - working-directory: /home/runner/work/ - run: git clone https://github.com/bottlesdevs/build-tools.git + uses: actions/checkout@v4 + with: + repository: koplo199/build-tools + path: build-tools + + - name: Get release version + working-directory: runtime_source + id: vars + run: | + version=$(cat VERSION) + echo "release_version=${version}" >> $GITHUB_OUTPUT + + - name: Install container dependencies + run: apt-get update -qq && apt -y install sudo - name: Make build scripts executable - working-directory: /home/runner/work/build-tools/runtime + working-directory: build-tools/runtime run: chmod +x * - name: Launch environment.sh - working-directory: /home/runner/work/build-tools/runtime - run: ./environment.sh + working-directory: build-tools/runtime + run: ./environment.sh "${{ steps.vars.outputs.release_version }}" "Debian" "12" - name: Launch build.sh - working-directory: /home/runner/work/build-tools/runtime + working-directory: build-tools/runtime run: ./build.sh - - name: Get release version - working-directory: /home/runner/work/runtime/runtime - id: vars - run: | - version=$(cat VERSION) - echo "::set-output name=release_version::${version}" - - name: Rename runtime archive - working-directory: /home/runner run: | mv "runtime.tar.gz" "runtime-${{ steps.vars.outputs.release_version }}.tar.gz" @@ -44,11 +52,11 @@ jobs: prerelease: false automatic_release_tag: "${{ steps.vars.outputs.release_version }}" title: "${{ steps.vars.outputs.release_version }}" - files: "/home/runner/runtime-${{ steps.vars.outputs.release_version }}.tar.gz" + files: "runtime-${{ steps.vars.outputs.release_version }}.tar.gz" - name: Upload log.txt uses: actions/upload-artifact@v2 with: name: log.txt - path: /home/runner/work/build-tools/runtime/runtimezilla/log.txt + path: build-tools/runtime/runtimezilla/log.txt diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index 660f34d..0000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: tests -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: -jobs: - build: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - - name: tests - working-directory: /home/runner/work/ - run: | - lsb_release -a - sudo apt install aptitude -y - sudo aptitude install libsoxr0 libsoxr0:i386 -y - From 648ac118206e2174060cec04ec8f9b333b14aba4 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Thu, 28 Sep 2023 15:43:31 +0200 Subject: [PATCH 2/7] Bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 844f6a9..eb49d7c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.3 +0.7 From 02da2a7c77d9640633f1397c18951d2a3ece609f Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Thu, 28 Sep 2023 14:02:15 +0000 Subject: [PATCH 3/7] Update build.yml --- .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 df122cf..56f2fd2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Fetching Build Tools uses: actions/checkout@v4 with: - repository: koplo199/build-tools + repository: bottlesdevs/build-tools path: build-tools - name: Get release version From 520fa0f07c5105b9aa19438971be6e0b40f44519 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Sun, 1 Oct 2023 10:33:06 +0200 Subject: [PATCH 4/7] Only release on VERSION change --- .github/workflows/build.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56f2fd2..302758f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,11 +6,12 @@ on: jobs: build: runs-on: ubuntu-latest - container: - image: debian:bookworm +# container: +# image: debian:bookworm steps: - uses: actions/checkout@v4 with: + fetch-depth: 0 path: runtime_source - name: Fetching Build Tools @@ -24,10 +25,17 @@ jobs: id: vars run: | version=$(cat VERSION) + is_new_version=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} VERSION) + if ! [ -z "$is_new_version" ]; then + is_new_version=true + else + is_new_version=false + fi echo "release_version=${version}" >> $GITHUB_OUTPUT + echo "new_version=${is_new_version}" >> $GITHUB_OUTPUT - - name: Install container dependencies - run: apt-get update -qq && apt -y install sudo +# - name: Install container dependencies +# run: apt-get update -qq && apt -y install sudo - name: Make build scripts executable working-directory: build-tools/runtime @@ -46,6 +54,7 @@ jobs: mv "runtime.tar.gz" "runtime-${{ steps.vars.outputs.release_version }}.tar.gz" - uses: "marvinpinto/action-automatic-releases@latest" + if: steps.vars.outputs.new_version == 'true' with: repo_token: "${{ secrets.GITHUB_TOKEN }}" draft: false @@ -59,4 +68,3 @@ jobs: with: name: log.txt path: build-tools/runtime/runtimezilla/log.txt - From 3927beb4a3335ba6beb6877ba0ea00ed92cdd190 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Sun, 1 Oct 2023 10:33:53 +0200 Subject: [PATCH 5/7] Un-bump VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index eb49d7c..844f6a9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.7 +0.6.3 From 2a6add8f024bbe60fc2557773dc63fa556c265a3 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Sun, 1 Oct 2023 11:22:22 +0200 Subject: [PATCH 6/7] Some cleanup --- .github/workflows/build.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 302758f..fac793a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,12 +3,24 @@ on: push: branches: [ main ] workflow_dispatch: + +env: +# We cannot use env for containers... +# https://github.com/actions/runner/issues/2394 +# CONTAINER: debian:bookworm + CONTAINER_NAME: Debian + CONTAINER_VERSION: 12 + jobs: build: runs-on: ubuntu-latest -# container: -# image: debian:bookworm + container: + image: debian:bookworm +# image: ${{ env.CONTAINER }} steps: + - name: Install container dependencies + run: apt-get update -qq && apt -y install git sudo + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -34,16 +46,13 @@ jobs: echo "release_version=${version}" >> $GITHUB_OUTPUT echo "new_version=${is_new_version}" >> $GITHUB_OUTPUT -# - name: Install container dependencies -# run: apt-get update -qq && apt -y install sudo - - name: Make build scripts executable working-directory: build-tools/runtime run: chmod +x * - name: Launch environment.sh working-directory: build-tools/runtime - run: ./environment.sh "${{ steps.vars.outputs.release_version }}" "Debian" "12" + run: ./environment.sh "${{ steps.vars.outputs.release_version }}" ${{ env.CONTAINER_NAME }} ${{ env.CONTAINER_VERSION }} - name: Launch build.sh working-directory: build-tools/runtime From d6f449aa6ff71aec33b185516670a0086995be41 Mon Sep 17 00:00:00 2001 From: koplo199 <85577251+koplo199@users.noreply.github.com> Date: Mon, 2 Oct 2023 09:18:13 +0200 Subject: [PATCH 7/7] Update README.md --- README.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6fe9fe7..4c495d9 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,11 @@ # Bottles Runtime -This is a set of librarires from Ubuntu 20.04 to ensure runners compatibility +This is a set of libraries to ensure runners compatibility. ## Build The runtime is built using [runtimezilla](https://github.com/mirkobrombin/runtimezilla), find the automated scripts in the [build-tools](https://github.com/bottlesdevs/build-tools) repository. ## Include -Read [here](https://github.com/bottlesdevs/build-tools/blob/main/runtime/recipe.yml) what this runtime includes. +Are currently included: +1) [libwine](https://packages.debian.org/bookworm/libwine) dependencies + +Read [here](https://github.com/bottlesdevs/build-tools/blob/main/runtime/recipe.yml) the full list of libraries included.