From 6bc881d0cc0fda2354d259b9437722846cce3779 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 13 Oct 2021 16:20:41 +0200 Subject: [PATCH] Build only on flatpak --- .github/workflows/ci.yml | 106 ++------------------------------------- 1 file changed, 5 insertions(+), 101 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 924a794..30973ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,57 +9,14 @@ env: DOCKER_VERSION: 31 jobs: - Docker: - strategy: - fail-fast: false - matrix: - variant: [xenial, bionic, f31, focal] - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Build docker image - shell: bash - run: | - TAGNAME=${{matrix.variant}}-${DOCKER_VERSION} - if [ ! $(curl -sflL https://hub.docker.com/v2/repositories/kiwix/kiwix-build_ci/tags/${TAGNAME}) ] - then - echo "${{secrets.docker_password}}" | docker login -u "${{secrets.docker_username}}" --password-stdin - FULLTAGNAME=kiwix/kiwix-build_ci:${TAGNAME} - docker build -t ${FULLTAGNAME} - < ${GITHUB_WORKSPACE}/.github/ci_images/${{matrix.variant}}_builder.dockerfile - docker push ${FULLTAGNAME} - fi - Linux: strategy: fail-fast: false matrix: target: - - native_static - - native_dyn - - native_mixed - - native_desktop - - armhf_static - - armhf_dyn - - i586_static - - i586_dyn - - android_arm - - android_arm64 - - android_x86 - - android_x86_64 - image_variant: ['xenial', 'bionic'] + - flatpak + image_variant: ['bionic'] lib_postfix: ['/x86_64-linux-gnu'] - include: - - target: win32_static - image_variant: f31 - lib_postfix: '64' - - target: win32_dyn - image_variant: f31 - lib_postfix: '64' - exclude: - - target: native_desktop - image_variant: xenial - - target: native_static - image_variant: bionic env: HOME: /home/runner SSH_KEY: /tmp/id_rsa @@ -67,6 +24,7 @@ jobs: needs: Docker container: image: "kiwix/kiwix-build_ci:${{matrix.image_variant}}-31" + options: "--device /dev/fuse --privileged" steps: - name: Checkout code shell: bash @@ -90,11 +48,11 @@ jobs: kiwix-build/.github/scripts/ensure_base_deps.py env: PLATFORM_TARGET: ${{matrix.target}} - - name: Compile all deps + - name: Build release shell: bash run: | cd $HOME - kiwix-build/.github/scripts/compile_all_deps.py + kiwix-build/.github/scripts/build_release_nightly.py env: PLATFORM_TARGET: ${{matrix.target}} - name: Upload failure logs @@ -102,57 +60,3 @@ jobs: run: $HOME/kiwix-build/.github/scripts/upload_failure_logs.sh env: PLATFORM_TARGET: ${{matrix.target}} - - - Macos: - strategy: - fail-fast: false - matrix: - target: - - native_dyn - - native_mixed - - iOS_arm64 - - iOS_x86_64 - - iOS_Mac_ABI - runs-on: macos-latest - env: - SSH_KEY: /tmp/id_rsa - OS_NAME: osx - steps: - - name: Checkout code - uses: actions/checkout@v1 - - name: Setup python 3.6 - uses: actions/setup-python@v1 - with: - python-version: '3.6' - - name: Install packages - run: - brew install pkg-config ninja automake autoconf - - name: Install python modules - run: | - pip3 install meson==0.52.1 pytest requests distro - pip3 install --no-deps $GITHUB_WORKSPACE - - name: secret - shell: bash - run: | - echo "${{secrets.ssh_key}}" > $SSH_KEY - chmod 600 $SSH_KEY - - name: Ensure base deps - shell: bash - run: | - cd $HOME - $GITHUB_WORKSPACE/.github/scripts/ensure_base_deps.py - env: - PLATFORM_TARGET: ${{matrix.target}} - - name: Compile all deps - shell: bash - run: | - cd $HOME - $GITHUB_WORKSPACE/.github/scripts/compile_all_deps.py - env: - PLATFORM_TARGET: ${{matrix.target}} - - name: Upload failure logs - if: failure() - run: $GITHUB_WORKSPACE/.github/scripts/upload_failure_logs.sh - env: - PLATFORM_TARGET: ${{matrix.target}}