diff --git a/.github/workflows/build-debug.yml b/.github/workflows/build-debug.yml deleted file mode 100644 index 8a8cf09..0000000 --- a/.github/workflows/build-debug.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Build-Debug - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v4 - - - name: Install LLVM - run: sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" - - - name: Set up Android NDK r23b - run: | - curl -fLO https://dl.google.com/android/repository/android-ndk-r23b-linux.zip - unzip -qd . android-ndk-r23b-linux.zip - - - name: Build - run: | - git submodule update --init --recursive - sed -i '/COMPILE_DEFINITIONS "MyRelease"/d' CMakeLists.txt - mkdir build - cd build - cmake .. - make - - - name: Set outputs - id: vars - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: Wrapper.Debug.x86_64.${{ steps.vars.outputs.sha_short }} - include-hidden-files: true - path: | - rootfs - wrapper - Dockerfile diff --git a/.github/workflows/build.yml b/.github/workflows/build-for-x86_64.yml similarity index 52% rename from .github/workflows/build.yml rename to .github/workflows/build-for-x86_64.yml index b9268d2..67dd2a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build-for-x86_64.yml @@ -1,4 +1,4 @@ -name: Build +name: Build for x86_64 on: push: @@ -6,13 +6,17 @@ on: pull_request: branches: [ "main" ] +permissions: + contents: write + jobs: build: - runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: Install LLVM run: sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" @@ -33,29 +37,23 @@ jobs: id: vars run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: Wrapper.x86_64.${{ steps.vars.outputs.sha_short }} - include-hidden-files: true - path: | - rootfs - wrapper - wrapper-rootless - compose.yaml - entrypoint.sh - Dockerfile - - name: Create Release Zip File - run: zip -r Wrapper.x86_64.${{ steps.vars.outputs.sha_short }}.zip rootfs/ wrapper Dockerfile + run: zip -r Wrapper.x86_64.latest.zip rootfs/ wrapper wrapper-rootless Dockerfile compose.yaml entrypoint.sh - - name: Create Release + - name: Update Tag + run: | + git tag -f wrapper.x86_64.latest + git push origin wrapper.x86_64.latest --force + + - name: Create or Update Release uses: softprops/action-gh-release@v2 with: - files: Wrapper.x86_64.${{ steps.vars.outputs.sha_short }}.zip - body: ${{ github.event.head_commit.message }} - name: Wrapper.x86_64.${{ steps.vars.outputs.sha_short }} - tag_name: Wrapper.x86_64.${{ steps.vars.outputs.sha_short }} + files: Wrapper.x86_64.latest.zip + body: | + Latest build for x86_64. + Commit: ${{ github.sha }} + Message: ${{ github.event.head_commit.message }} + name: Wrapper.x86_64.latest + tag_name: wrapper.x86_64.latest make_latest: true - - + overwrite: true \ No newline at end of file diff --git a/.github/workflows/wrapper-qemu.yml b/.github/workflows/wrapper-qemu.yml deleted file mode 100644 index a4d0449..0000000 --- a/.github/workflows/wrapper-qemu.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: wrapper-qemu - -on: - workflow_run: - workflows: ["Build"] - types: [completed] - -jobs: - on-success: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} - steps: - - uses: actions/checkout@v4 - - - name: Download wrapper-qemu basic image - run: wget https://github.com/WorldObservationLog/wrapper/releases/download/wrapper-qemu/wrapper.qcow2 - - - name: Mount image - run: | - sudo apt-get install -y qemu-utils - sudo modprobe nbd max_part=8 - sudo qemu-nbd --connect=/dev/nbd0 wrapper.qcow2 - sudo mkdir /mnt/wrapper - sudo mount /dev/nbd0p3 /mnt/wrapper/ - - - name: Download latest artifact - uses: dawidd6/action-download-artifact@v6 - with: - github_token: ${{secrets.ACTION_TOKEN}} - run_id: ${{ github.event.workflow_run.id }} - - - name: Copy wrapper to image - run: | - mv Wrapper.x86_64.* wrapper - sudo mv wrapper /mnt/wrapper/root/wrapper - sudo chmod +x /mnt/wrapper/root/wrapper/wrapper - - - name: Unmount image - run: | - sudo umount /mnt/wrapper/ - sudo qemu-nbd --disconnect /dev/nbd0 - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: wrapper-qemu - path: wrapper.qcow2 - diff --git a/.gitignore b/.gitignore index d408b9c..fcec574 100644 --- a/.gitignore +++ b/.gitignore @@ -90,6 +90,7 @@ dkms.conf rootfs/ .vscode/ wrapper +wrapper-rootless rootfs/system/bin/linker64 build/ android-ndk-r23b/