ソースを参照

Include patches.

next_step
Luigi Cruz 3年前
コミット
29acb48b6a
6個のファイルの変更13行の追加61行の削除
  1. +0
    -50
      .github/workflows/release.yml
  2. +2
    -2
      .github/workflows/validate.yml
  3. +0
    -1
      ansible/standalone.yaml
  4. +1
    -0
      ansible/tasks/umount.yaml
  5. +2
    -2
      build.sh
  6. +8
    -6
      build_base.sh

+ 0
- 50
.github/workflows/release.yml ファイルの表示

@@ -1,50 +0,0 @@
on:
release:
types: [ created ]

name: Build & Deploy Image

jobs:
build:
name: Build & Release Image
runs-on: self-hosted
timeout-minutes: 2880
env:
working-directory: ./
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Clean docker
id: clean_docker
working-directory: ${{ env.working-directory }}
run: |
docker system prune -af
docker system prune --volumes -f
docker image prune -af
docker container stop $(docker container ls -aq) || true
docker container rm $(docker container ls -aq) || true
- name: Build project
id: builder
working-directory: ${{ env.working-directory }}
run: |
bash build-docker.sh
echo ::set-output name=filename::$(ls deploy/*.img.xz | xargs -n 1 basename)
- name: Fix Permissions
id: fix_perm_filename
run: |
chmod a+rw ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
echo ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
- name: Upload Release Asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.LONG_TOKEN }}
with:
upload_url: ${{ github.event.release.upload_url }}
asset_path: ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}
asset_name: ${{ steps.builder.outputs.filename }}
asset_content_type: application/x-tar
- name: Delete Image
id: delete_image
run: |
rm ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }}

+ 2
- 2
.github/workflows/validate.yml ファイルの表示

@@ -1,11 +1,11 @@
on: ['pull_request']
on: ['commit']

name: Build & Validate Image

jobs:
build:
name: Build & Validate Image
runs-on: self-hosted
runs-on: arm64
timeout-minutes: 2880
env:
working-directory: ./


+ 0
- 1
ansible/standalone.yaml ファイルの表示

@@ -5,7 +5,6 @@
vars:
PISDR_USER: luigi
pre_tasks:
- {include: 'tasks/mount.yaml', tags: 'always'}
- {include: 'tasks/update-apt.yaml', tags: 'always'}
roles:
- {role: 'uhd', tags: 'uhd'}


+ 1
- 0
ansible/tasks/umount.yaml ファイルの表示

@@ -2,6 +2,7 @@
- name: Umount pseudo filesystems
connection: local
shell: umount -l '{{ lookup('env', 'ANSIBLE_ROOTFS_DIR') }}{{ item }}'
ignore_errors: yes
with_items:
- /proc
- /dev/pts


+ 2
- 2
build.sh ファイルの表示

@@ -12,9 +12,9 @@ export PISDR_IMG_NAME="$(date '+%Y-%m-%d')-PiSDR-$PISDR_ARCH"

#### Build Settings
BUILD_BOARD_TEGRA_NANO=true
BUILD_BOARD_TEGRA_AGX=true
BUILD_BOARD_TEGRA_AGX=false
BUILD_BOARD_RPI=false
BUILD_BOARD_GRUB=true
BUILD_BOARD_GRUB=false

#### Compiler Settings
export TARGET="/target"


+ 8
- 6
build_base.sh ファイルの表示

@@ -6,13 +6,15 @@ printf "Create base rootfs directory... "
mkdir -p $BASE_DIR
printf "(OK)\n"

printf "Enabling qemu kernel components... "
update-binfmts --enable qemu-arm > /dev/null 2>&1
if [ ! "$(ls -A /proc/sys/fs/binfmt_misc/)" ]; then
printf "(NOK)\n"
exit
if [[ "$PISDR_ARCH" != $(uname -p) ]]; then
printf "Enabling qemu kernel components... "
update-binfmts --enable qemu-arm > /dev/null 2>&1
if [ ! "$(ls -A /proc/sys/fs/binfmt_misc/)" ]; then
printf "(NOK)\n"
exit
fi
printf "(OK)\n"
fi
printf "(OK)\n"

echo "Run debootstrap first stage..."
if [ ! -f "${BASE_DIR}/.bootstrap_completed" ]; then


読み込み中…
キャンセル
保存