Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
klaxalk committed Aug 12, 2023
1 parent 1001210 commit 4733912
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 19 deletions.
8 changes: 2 additions & 6 deletions .ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@ ARTIFACTS_FOLDER=/tmp/artifacts

./.ci_scripts/package_build/add_ros_ppa.sh

if [[ "$VARIANT" == "stable" ]]; then
./.ci_scripts/package_build/add_ctu_mrs_stable_ppa.sh
else
./.ci_scripts/package_build/add_ctu_mrs_unstable_ppa.sh
fi
curl https://ctu-mrs.github.io/ppa-$VARIANT/add_ppa.sh | bash

# dependencies need for build the deb package
sudo apt-get -y install ros-noetic-catkin python3-catkin-tools
Expand Down Expand Up @@ -62,7 +58,7 @@ echo "$0: catking reported following topological build order:"
echo "$BUILD_ORDER"
echo ""

ROSDEP_FILE=$ARTIFACTS_FOLDER/test.yaml
ROSDEP_FILE=$ARTIFACTS_FOLDER/generated_$ARCH.yaml

echo "yaml file://$ROSDEP_FILE" | sudo tee /etc/ros/rosdep/sources.list.d/temp.list

Expand Down
6 changes: 1 addition & 5 deletions .ci/get_build_matrix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ ARTIFACTS_FOLDER=/tmp/artifacts

./.ci_scripts/package_build/install_ros.sh >/tmp/log.txt 2>&1

if [[ "$VARIANT" == "stable" ]]; then
./.ci_scripts/package_build/add_ctu_mrs_stable_ppa.sh >/tmp/log.txt 2>&1
else
./.ci_scripts/package_build/add_ctu_mrs_unstable_ppa.sh >/tmp/log.txt 2>&1
fi
curl https://ctu-mrs.github.io/ppa-$VARIANT/add_ppa.sh | bash

# dependencies need for build the deb package
sudo apt-get -y install ros-noetic-catkin python3-catkin-tools >/tmp/log.txt 2>&1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unstable_amd64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- id: execute
run: |
mkdir -p /tmp/artifacts
touch /tmp/artifacts/test.yaml
touch /tmp/artifacts/generated_amd64.yaml
- name: Save artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unstable_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- id: execute
run: |
mkdir -p /tmp/artifacts
touch /tmp/artifacts/test.yaml
touch /tmp/artifacts/generated_arm64.yaml
- name: Save artifacts
uses: actions/upload-artifact@v3
with:
Expand Down
6 changes: 0 additions & 6 deletions test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,3 @@ mrs_lib:
source: https://github.com/ctu-mrs/mrs_lib
unstable_ref: hw_api
stable_ref: release

mrs_uav_hw_api:
architecture: [amd64, arm64]
source: https://github.com/ctu-mrs/mrs_uav_hw_api
unstable_ref: master
stable_ref: release

0 comments on commit 4733912

Please sign in to comment.