diff --git a/.github/actions/build_urcap/Dockerfile b/.github/actions/build_urcap/Dockerfile deleted file mode 100644 index 0aa9af3..0000000 --- a/.github/actions/build_urcap/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# Container image that runs your code -FROM ubuntu:bionic - -# Copies your code file from your action repository to the filesystem path `/` of the container -COPY entrypoint.sh /entrypoint.sh - -RUN apt-get update && apt-get install -y \ - ant\ - default-jdk\ - maven\ - unzip\ - dialog\ - sshpass\ - curl - -# Code file to execute when the docker container starts up (`entrypoint.sh`) -ENTRYPOINT ["/entrypoint.sh"] diff --git a/.github/actions/build_urcap/action.yml b/.github/actions/build_urcap/action.yml deleted file mode 100644 index b6dbda0..0000000 --- a/.github/actions/build_urcap/action.yml +++ /dev/null @@ -1,6 +0,0 @@ -# action.yml -name: 'Build URCap' -description: 'Builds a URCap in a container' -runs: - using: 'docker' - image: 'Dockerfile' diff --git a/.github/actions/build_urcap/entrypoint.sh b/.github/actions/build_urcap/entrypoint.sh deleted file mode 100755 index 8dd383b..0000000 --- a/.github/actions/build_urcap/entrypoint.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -set -e - -SDK_MAJOR=$(echo ${SDK_VERSION} | awk -F. '{print $1}') -SDK_MINOR=$(echo ${SDK_VERSION} | awk -F. '{print $2}') -SDK_BUILD=$(echo ${SDK_VERSION} | awk -F. '{print $3}') - -download_folder=$(mktemp -d) -pushd ${download_folder} -curl -o sdk-${SDK_VERSION}.zip https://s3-eu-west-1.amazonaws.com/urplus-developer-site/sdk/sdk-${SDK_VERSION}.zip -mkdir sdk -unzip -q sdk-${SDK_VERSION}.zip -d sdk -if [ "$SDK_MAJOR" -eq 1 ] && [ "$SDK_MINOR" -ne 10 ]; then - cd sdk -else - cd sdk/URCap_SDK-${SDK_VERSION} -fi -./install.sh - -popd - -mvn install diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml index 7f45a3e..7977486 100644 --- a/.github/workflows/compile.yml +++ b/.github/workflows/compile.yml @@ -1,5 +1,13 @@ +--- name: Build URCap -on: [push, pull_request] +on: + workflow_dispatch: + pull_request: + push: + branches: + - master + schedule: + - cron: '48 15 21 * 0' # Build once a month to make sure the workflow is functional jobs: build: @@ -7,15 +15,32 @@ jobs: strategy: fail-fast: false matrix: - SDK_VERSION: [1.10.0, 1.11.0, 1.12.0] + SDK_VERSION: [1.11.0, 1.12.0, 1.13.0, 1.14.0] steps: - - uses: actions/checkout@v1 - - uses: ./.github/actions/build_urcap + - uses: actions/checkout@v4 + - run: | + SDK_MAJOR=$(echo ${SDK_VERSION} | awk -F. '{print $1}') + SDK_MINOR=$(echo ${SDK_VERSION} | awk -F. '{print $2}') + SDK_BUILD=$(echo ${SDK_VERSION} | awk -F. '{print $3}') + sudo apt-get update && sudo apt-get install -y openjdk-8-jdk maven dialog sshpass unzip curl + download_folder=$(mktemp -d) + pushd ${download_folder} + curl -o sdk-${SDK_VERSION}.zip https://s3-eu-west-1.amazonaws.com/urplus-developer-site/sdk/sdk-${SDK_VERSION}.zip + mkdir sdk + unzip -q sdk-${SDK_VERSION}.zip -d sdk + if [ "$SDK_MAJOR" -eq 1 ] && [ "$SDK_MINOR" -eq 10 ]; then + cd sdk/URCap_SDK-${SDK_VERSION} + else + cd sdk + fi + ./install.sh + popd + mvn install env: SDK_VERSION: ${{ matrix.SDK_VERSION }} - name: Upload urcap_artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v4 with: path: target - name: ROS_as_a_Service_sdk-${{ matrix.SDK_VERSION }}.urcap + name: tool_comm_forwarder-${{ matrix.SDK_VERSION }}.urcap diff --git a/pom.xml b/pom.xml index f6eac7d..ed5888d 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,8 @@ maven-compiler-plugin 3.6.0 - 1.6 - 1.6 + 1.8 + 1.8