Skip to content

Commit

Permalink
Do not patch armbian#4077, only build jammy legacy minimal and cli ve…
Browse files Browse the repository at this point in the history
…rsion with btrfs rootfs
  • Loading branch information
Wikeolf committed Jan 8, 2024
1 parent 6de0f77 commit 0f09fc1
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:
UBOOT_REPO: hzyitc/u-boot-onecloud
UBOOT_RELEASE: latest
UBOOT_BURNIMG: eMMC.burn.img
ARMBIAN_REPO: wikeolf/armbian-onecloud
ARMBIAN_REPO: Wikeolf/armbian-onecloud
ARMBIAN_REF: main

jobs:
Expand Down Expand Up @@ -81,8 +81,8 @@ jobs:
fail-fast: false
matrix:
BRANCH:
- edge
- current
# - edge
# - current
- legacy

steps:
Expand All @@ -104,7 +104,7 @@ jobs:
KERNEL_CONFIGURE=no \
KERNEL_ONLY=yes \
EXPERT=yes \
ROOTFS_TYPE=btrfs\
ROOTFS_TYPE=btrfs \
USE_CCACHE=no \
NO_APT_CACHER=yes
sudo chown $(id -u):$(id -g) -R output/
Expand All @@ -123,24 +123,24 @@ jobs:
fail-fast: false
matrix:
BRANCH:
- edge
- current
# - edge
# - current
- legacy
RELEASE:
# - focal # Ubuntu 20.04 LTS
- jammy # Ubuntu 22.04 LTS
# - buster # Debian 10
- bullseye # Debian 11
- sid # Debian unstable
# - bullseye # Debian 11
# - sid # Debian unstable
TYPE:
- minimal
- cli
- desktop
include:
- TYPE: desktop
DESKTOP_ENVIRONMENT: xfce
DESKTOP_ENVIRONMENT_CONFIG_NAME: config_base
DESKTOP_APPGROUPS_SELECTED: ""
# - desktop
# include:
# - TYPE: desktop
# DESKTOP_ENVIRONMENT: xfce
# DESKTOP_ENVIRONMENT_CONFIG_NAME: config_base
# DESKTOP_APPGROUPS_SELECTED: ""

steps:
- name: Import env
Expand All @@ -153,12 +153,12 @@ jobs:
repository: ${{ env.ARMBIAN_REPO }}
ref: ${{ env.ARMBIAN_SHA }}

- name: "Apply patch #4077"
run: |
curl -L -O "https://github.com/armbian/build/pull/4077.patch"
for file in *.patch; do
patch --batch -p1 -N <"$file"
done
# - name: "Apply patch #4077"
# run: |
# curl -L -O "https://github.com/armbian/build/pull/4077.patch"
# for file in *.patch; do
# patch --batch -p1 -N <"$file"
# done

- name: Download debs
uses: actions/download-artifact@v3
Expand Down

0 comments on commit 0f09fc1

Please sign in to comment.