Skip to content

Commit

Permalink
Merge pull request #953 from kiwix/remove-bionic
Browse files Browse the repository at this point in the history
Remove Ubuntu Bionic from CI/CD
  • Loading branch information
kelson42 authored Jul 3, 2023
2 parents adad44a + 9445197 commit ac9b31f
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 50 deletions.
62 changes: 27 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,42 @@
name: CI

on: [push]
on:
pull_request:
push:
branches:
- main

jobs:
Linux:
strategy:
fail-fast: false
matrix:
target:
- bionic
- focal
include:
- target: bionic
image_variant: bionic
- target: focal
image_variant: focal
lib_postfix: '/x86_64-linux-gnu'
env:
HOME: /home/runner
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
container:
image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:36
image: ghcr.io/kiwix/kiwix-build_ci_${{matrix.image_variant}}:38

steps:
- name: Extract branch name
shell: bash
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
id: extract_branch
- name: Checkout code
shell: python
run: |
from subprocess import check_call
from os import environ
command = [
'git', 'clone',
'https://github.com/${{github.repository}}',
'--depth=1',
'--branch', '${{steps.extract_branch.outputs.branch}}'
]
check_call(command, cwd=environ['HOME'])
- name: Install deps
shell: bash
run: |
ARCHIVE_NAME=deps2_bionic_native_dyn_kiwix-desktop.tar.xz
wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C /home/runner
- name: Compile
shell: bash
run: |
cd $HOME/kiwix-desktop
qmake PREFIX=$HOME/BUILD_native_dyn/INSTALL
make
env:
PKG_CONFIG_PATH: "/home/runner/BUILD_native_dyn/INSTALL/lib/pkgconfig:/home/runner/BUILD_native_dyn/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
- name: Install dependencies
shell: bash
run: |
ARCHIVE_NAME=deps2_focal_native_dyn_kiwix-desktop.tar.xz
wget -O- http://tmp.kiwix.org/ci/${ARCHIVE_NAME} | tar -xJ -C ${{env.HOME}}
- name: Retrieve source code
uses: actions/checkout@v3

- name: Compile source code
shell: bash
env:
PKG_CONFIG_PATH: "/home/runner/BUILD_native_dyn/INSTALL/lib/pkgconfig:/home/runner/BUILD_native_dyn/INSTALL/lib${{matrix.lib_postfix}}/pkgconfig"
run: |
qmake PREFIX=$HOME/BUILD_native_dyn/INSTALL
make
25 changes: 10 additions & 15 deletions .github/workflows/package.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
name: Packages
on: [push, pull_request]

on:
pull_request:
push:
branches:
- main
release:
types: [published]

jobs:
build-deb:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
distro:
- ubuntu-kinetic
- ubuntu-jammy
- ubuntu-focal
- ubuntu-bionic
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -42,7 +48,6 @@ jobs:
args: --no-sign
ppa: ${{ steps.ppa.outputs.ppa }}


- uses: legoktm/gh-action-build-deb@ubuntu-jammy
if: matrix.distro == 'ubuntu-jammy'
name: Build package for ubuntu-jammy
Expand All @@ -59,22 +64,13 @@ jobs:
args: --no-sign
ppa: ${{ steps.ppa.outputs.ppa }}

- uses: legoktm/gh-action-build-deb@ubuntu-bionic
if: matrix.distro == 'ubuntu-bionic'
name: Build package for ubuntu-bionic
id: build-ubuntu-bionic
with:
args: --no-sign
ppa: ${{ steps.ppa.outputs.ppa }}

- uses: actions/upload-artifact@v3
with:
name: Packages for ${{ matrix.distro }}
path: output

- uses: legoktm/gh-action-dput@master
name: Upload dev package
# Only upload on pushes to git default branch
if: github.event_name == 'push' && github.event.ref == 'refs/heads/main' && startswith(matrix.distro, 'ubuntu-')
with:
gpg_key: ${{ secrets.LAUNCHPAD_GPG }}
Expand All @@ -83,8 +79,7 @@ jobs:

- uses: legoktm/gh-action-dput@master
name: Upload release package
# Only upload on pushes to master or tag
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && startswith(matrix.distro, 'ubuntu-')
if: github.event_name == 'release' && startswith(matrix.distro, 'ubuntu-')
with:
gpg_key: ${{ secrets.LAUNCHPAD_GPG }}
repository: ppa:kiwixteam/release
Expand Down

0 comments on commit ac9b31f

Please sign in to comment.