Skip to content

Commit

Permalink
test if runs-on: ubuntu-20.04 but using docker image for ubuntu-22.04…
Browse files Browse the repository at this point in the history
… works
  • Loading branch information
shanedell committed Feb 6, 2025
1 parent 002e172 commit 4c096b2
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
34 changes: 17 additions & 17 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Copyright (c) 2021 Concurrent Technologies Corporation.
#
#
# 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 is 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.
# 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 is 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.

---
name: Unit Tests
on:
push:
branches:
- '**'
- "**"

jobs:
build-native:
strategy:
matrix:
os: [ windows-2019, macos-13, ubuntu-22.04, macos-14 ]
fail-fast: false # don't immediately fail all other jobs if a single job fails
os: [windows-2019, macos-13, ubuntu-22.04, macos-14]
fail-fast: false # don't immediately fail all other jobs if a single job fails
name: Native build and test on ${{ matrix.os }} 🦙
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -37,10 +37,10 @@ jobs:
with:
runner-os: ${{ runner.os }}
os-name: ${{ matrix.os }}-${{ env.runner_arch }}

build-native-linux-arm64:
name: Native build ubuntu-22.04 arm64 🦙
runs-on: ubuntu-22.04
runs-on: ubuntu-20.04
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4
Expand All @@ -53,17 +53,17 @@ jobs:
library-filename: libomega_edit.so

build-middleware:
needs: [ build-native ]
needs: [build-native]
strategy:
matrix:
os: [ windows-2019, macos-13, ubuntu-22.04, macos-14 ]
os: [windows-2019, macos-13, ubuntu-22.04, macos-14]
fail-fast: false
runs-on: ${{ matrix.os }}
name: Build middleware ${{ matrix.os }} 🔧
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4

- name: Convert runner arch to lower
shell: bash
run: |
Expand All @@ -84,7 +84,7 @@ jobs:
# steps:
# - name: Checkout 🛎️
# uses: actions/checkout@v4

# - name: Build Middleware ${{ matrix.os }}
# uses: ./.github/workflows/build-middleware-docker
# with:
Expand Down
18 changes: 9 additions & 9 deletions docker/Dockerfile.ubuntu22-cpp-env
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Copyright (c) 2021 Concurrent Technologies Corporation.
#
#
# 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 is 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.
# 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 is 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.

# Build:
# docker build -t build/ubuntu-22.04/cpp-env:1.0 -f Dockerfile.ubuntu22-cpp-env .
Expand All @@ -16,7 +16,7 @@ FROM ubuntu:22.04

LABEL maintainer="[email protected]" \
version="1.1" \
description="Ubuntu 20.04 with tools for C/C++, Scala, and Node.js development"
description="Ubuntu 22.04 with tools for C/C++, Scala, and Node.js development"

ENV DEBIAN_FRONTEND="noninteractive" \
TZ="America/New_York"
Expand Down

0 comments on commit 4c096b2

Please sign in to comment.