From f4470d27db99b7d2a043d2a636c0db14d844d5a5 Mon Sep 17 00:00:00 2001 From: dev Date: Wed, 1 May 2024 09:27:39 -0400 Subject: [PATCH] Remove unused checkout.sh script and set runner explicitly --- .github/workflows/docker.yml | 3 ++- .github/workflows/dockerhub.yml | 6 +++-- docker/checkout.sh | 44 --------------------------------- 3 files changed, 6 insertions(+), 47 deletions(-) delete mode 100755 docker/checkout.sh diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fe5ecef7..c0dd0b02 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -2,7 +2,8 @@ name: Docker build on: pull_request: types: [opened, synchronize, reopened] - jobs: docker: uses: usdot-fhwa-stol/actions/.github/workflows/docker.yml@main + with: + runner: ubuntu-latest-16-core diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml index abdd8134..13e267ac 100644 --- a/.github/workflows/dockerhub.yml +++ b/.github/workflows/dockerhub.yml @@ -2,8 +2,8 @@ name: Docker Hub build on: push: branches: - - "develop" - - "master" + - develop + - master - "release/*" tags: - "carma-system-*" @@ -14,3 +14,5 @@ jobs: secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + with: + runner: ubuntu-latest-16-core diff --git a/docker/checkout.sh b/docker/checkout.sh deleted file mode 100755 index 06391349..00000000 --- a/docker/checkout.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -# Copyright (C) 2018-2020 LEIDOS. -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -# CARMA packages checkout script -# Optional argument to set the root checkout directory with no ending '/' default is '~' - -set -ex - -dir=~ -while [[ $# -gt 0 ]]; do - arg="$1" - case $arg in - -d|--develop) - BRANCH=develop - shift - ;; - -r|--root) - dir=$2 - shift - shift - ;; - esac -done - -if [[ "$BRANCH" = "develop" ]]; then - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ~/src/carma-msgs --branch $BRANCH --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ~/src/carma-utils --branch $BRANCH --depth 1 -else - git clone https://github.com/usdot-fhwa-stol/carma-msgs.git ${dir}/src/carma-msgs --branch carma-system-4.5.0 --depth 1 - git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/carma-utils --branch carma-system-4.5.0 --depth 1 -fi