Skip to content

Commit

Permalink
updated scripts, added thirdparty
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Sep 16, 2023
1 parent 625330a commit 7a99efb
Show file tree
Hide file tree
Showing 9 changed files with 424 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ set -e
trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
trap 'echo "$0: \"${last_command}\" command failed with exit code $?"' ERR

VARIANT=$1
PACKAGE_NAME=$2
YAML_FILE=$1
VARIANT=$2
PACKAGE_NAME=$3
WORKSPACE=/tmp/workspace
YAML_FILE=packages.yaml
ARTIFACTS_FOLDER=/tmp/artifacts
IDX_FILE=$ARTIFACTS_FOLDER/idx.txt

Expand Down
6 changes: 3 additions & 3 deletions .ci/get_build_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ trap 'echo "$0: \"${last_command}\" command failed with exit code $?, log:" && c

DEBUG=false

VARIANT=$1
ARCH=$2
YAML_FILE=$1
VARIANT=$2
ARCH=$3
WORKSPACE=/tmp/workspace
YAML_FILE=packages.yaml
ARTIFACTS_FOLDER=/tmp/artifacts

./.ci_scripts/package_build/add_ros_ppa.sh >> /tmp/log.txt 2>&1
Expand Down
115 changes: 115 additions & 0 deletions .github/workflows/stable_mrs_amd64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
name: stable-amd64

on:
workflow_dispatch:

schedule:
- cron: '0 20 * * *' # every day at 10pm UTC+2

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

jobs:

init-artifacts:
runs-on: ubuntu-20.04
steps:
- id: execute
run: |
mkdir -p /tmp/artifacts
mkdir -p /tmp/artifacts/metarepositories
touch /tmp/artifacts/generated_amd64.yaml
touch /tmp/artifacts/compiled.txt
echo "0" >> /tmp/artifacts/idx.txt
- name: Save artifacts
uses: actions/upload-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/

generate-jobs:
needs: init-artifacts
runs-on: ubuntu-20.04
outputs:
packages: ${{ steps.generate.outputs.packages }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: 'recursive'
- name: Checkout CI scripts
uses: actions/checkout@v3
with:
repository: ctu-mrs/ci_scripts
ref: master
path: .ci_scripts
token: ${{ secrets.PUSH_TOKEN }}
- id: generate
run: |
JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml stable amd64)
cat /tmp/log.txt
echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
build-job:
needs: generate-jobs
runs-on: ubuntu-20.04
timeout-minutes: 360 # 6 hour timeout
strategy:
matrix:
job: ${{ fromJson(needs.generate-jobs.outputs.packages) }}
max-parallel: 1 # Run jobs serially
steps:
- name: Load artifacts
uses: actions/download-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: 'recursive'
- name: Checkout CI scripts
uses: actions/checkout@v3
with:
repository: ctu-mrs/ci_scripts
ref: master
path: .ci_scripts
token: ${{ secrets.PUSH_TOKEN }}
- id: build
run: |
.ci/build.sh mrs.yaml stable "${{ matrix.job }}"
- name: Save artifacts
uses: actions/upload-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/

collect-artifacts:
runs-on: ubuntu-20.04
needs: build-job
env:
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}
steps:
- name: Load artifacts
uses: actions/download-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/
- id: execute
run: |
[ -e /tmp/artifacts/compiled.txt ] && rm /tmp/artifacts/compiled.txt
[ -e /tmp/artifacts/idx.txt ] && rm /tmp/artifacts/idx.txt
[ -e /tmp/artifacts/compile_further.txt ] && rm /tmp/artifacts/compile_further.txt
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: 'recursive'
- name: Checkout CI scripts
uses: actions/checkout@v3
with:
repository: ctu-mrs/ci_scripts
ref: master
path: .ci_scripts
token: ${{ secrets.PUSH_TOKEN }}
- name: Deploy
run: .ci_scripts/package_build/push_to_ppa.sh stable /tmp/artifacts
140 changes: 140 additions & 0 deletions .github/workflows/stable_mrs_arm64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
name: stable-arm64

on:
workflow_dispatch:

schedule:
- cron: '0 20 * * *' # every day at 10pm UTC+2

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}

jobs:

init-artifacts:
runs-on: ubuntu-20.04
steps:
- id: execute
run: |
mkdir -p /tmp/artifacts
mkdir -p /tmp/artifacts/metarepositories
touch /tmp/artifacts/generated_arm64.yaml
touch /tmp/artifacts/compiled.txt
echo "0" >> /tmp/artifacts/idx.txt
- name: Save artifacts
uses: actions/upload-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/

generate-jobs:
needs: init-artifacts
runs-on: ubuntu-20.04
outputs:
packages: ${{ steps.generate.outputs.packages }}
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: 'recursive'
- name: Checkout CI scripts
uses: actions/checkout@v3
with:
repository: ctu-mrs/ci_scripts
ref: master
path: .ci_scripts
token: ${{ secrets.PUSH_TOKEN }}
- id: generate
run: |
JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml stable arm64)
cat /tmp/log.txt
echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
build-job:
needs: generate-jobs
runs-on: ubuntu-20.04
timeout-minutes: 360 # 6 hour timeout
strategy:
matrix:
job: ${{ fromJson(needs.generate-jobs.outputs.packages) }}
max-parallel: 1 # Run jobs serially
steps:
- name: Load artifacts
uses: actions/download-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: 'recursive'
- name: Checkout CI scripts
uses: actions/checkout@v3
with:
repository: ctu-mrs/ci_scripts
ref: master
path: .ci_scripts
token: ${{ secrets.PUSH_TOKEN }}
- uses: ctu-mrs/run-on-arch-action@master
name: build

id: build

with:
arch: aarch64
distro: noetic

githubToken: ${{ github.token }}

# Create an artifacts directory
setup: |
mkdir -p "/tmp/artifacts"
mkdir -p "/tmp/repository"
# Mount the artifacts directory as /artifacts in the container
dockerRunArgs: |
--volume "$PWD:/tmp/repository"
--volume "/tmp/artifacts:/tmp/artifacts"
# The shell to run commands with in the container
shell: /bin/sh

# Produce a binary artifact and place it in the mounted volume
run: |
/tmp/repository/.ci/build.sh mrs.yaml stable "${{ matrix.job }}"
- name: Save artifacts
uses: actions/upload-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/

collect-artifacts:
runs-on: ubuntu-20.04
needs: build-job
env:
PUSH_TOKEN: ${{ secrets.PUSH_TOKEN }}
steps:
- name: Load artifacts
uses: actions/download-artifact@v3
with:
name: artifacts
path: /tmp/artifacts/
- id: execute
run: |
[ -e /tmp/artifacts/compiled.txt ] && rm /tmp/artifacts/compiled.txt
[ -e /tmp/artifacts/idx.txt ] && rm /tmp/artifacts/idx.txt
[ -e /tmp/artifacts/compile_further.txt ] && rm /tmp/artifacts/compile_further.txt
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: 'recursive'
- name: Checkout CI scripts
uses: actions/checkout@v3
with:
repository: ctu-mrs/ci_scripts
ref: master
path: .ci_scripts
token: ${{ secrets.PUSH_TOKEN }}
- name: Deploy
run: .ci_scripts/package_build/push_to_ppa.sh stable /tmp/artifacts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: unstable-amd64
name: unstable-mrs-amd64

on:
workflow_dispatch:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
token: ${{ secrets.PUSH_TOKEN }}
- id: generate
run: |
JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh unstable amd64)
JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml unstable amd64)
cat /tmp/log.txt
echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
token: ${{ secrets.PUSH_TOKEN }}
- id: build
run: |
.ci/build.sh unstable "${{ matrix.job }}"
.ci/build.sh mrs.yaml unstable "${{ matrix.job }}"
- name: Save artifacts
uses: actions/upload-artifact@v3
with:
Expand All @@ -95,6 +95,11 @@ jobs:
with:
name: artifacts
path: /tmp/artifacts/
- id: execute
run: |
[ -e /tmp/artifacts/compiled.txt ] && rm /tmp/artifacts/compiled.txt
[ -e /tmp/artifacts/idx.txt ] && rm /tmp/artifacts/idx.txt
[ -e /tmp/artifacts/compile_further.txt ] && rm /tmp/artifacts/compile_further.txt
- uses: actions/checkout@v3
with:
fetch-depth: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: unstable-arm64
name: unstable-mrs-arm64

on:
workflow_dispatch:
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
token: ${{ secrets.PUSH_TOKEN }}
- id: generate
run: |
JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh unstable arm64)
JOB_STRATEGY_MATRIX=$(./.ci/get_build_matrix.sh mrs.yaml unstable arm64)
cat /tmp/log.txt
echo "packages=$JOB_STRATEGY_MATRIX" >> "$GITHUB_OUTPUT"
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:

# Produce a binary artifact and place it in the mounted volume
run: |
/tmp/repository/.ci/build.sh unstable "${{ matrix.job }}"
/tmp/repository/.ci/build.sh mrs.yaml unstable "${{ matrix.job }}"
- name: Save artifacts
uses: actions/upload-artifact@v3
Expand All @@ -120,6 +120,11 @@ jobs:
with:
name: artifacts
path: /tmp/artifacts/
- id: execute
run: |
[ -e /tmp/artifacts/compiled.txt ] && rm /tmp/artifacts/compiled.txt
[ -e /tmp/artifacts/idx.txt ] && rm /tmp/artifacts/idx.txt
[ -e /tmp/artifacts/compile_further.txt ] && rm /tmp/artifacts/compile_further.txt
- uses: actions/checkout@v3
with:
fetch-depth: 0
Expand Down
Loading

0 comments on commit 7a99efb

Please sign in to comment.