Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/grpc/grpc-js-1.12.5
Browse files Browse the repository at this point in the history
  • Loading branch information
scholarsmate authored Feb 7, 2025
2 parents cfd2f52 + 07e9853 commit 68fd271
Show file tree
Hide file tree
Showing 9 changed files with 59 additions and 57 deletions.
24 changes: 13 additions & 11 deletions .github/workflows/build-native-docker/action.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
# 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: Build Native
description: Reusable action for building native code using docker
inputs:
os-name:
description: 'OS Name (runs-on value)'
description: "OS Name (runs-on value)"
required: true
docker-image:
description: 'Docker image to use'
description: "Docker image to use"
required: true
library-filename:
description: 'Filename of library file (libomega_edit.so, libomega_edit.dylib or omega_edit.dll)'
description: "Filename of library file (libomega_edit.so, libomega_edit.dylib or omega_edit.dll)"
required: true
runs:
using: "composite"
Expand All @@ -34,6 +34,8 @@ runs:
shell: bash
run: |
docker run \
--platform linux/arm64/v8 \
--user root \
--memory "12g" \
--cpus "3" \
-d \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
actions: read
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ratCheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
jobs:
check:
name: Rat Check 🐀
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ env:
jobs:
quality-gate:
name: Quality Gate
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -85,7 +85,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
# This check name is defined as the github action job name (in .github/workflows/testing.yaml)
checkName: "Build middleware ubuntu-20.04 🔧"
checkName: "Build middleware ubuntu-22.04 🔧"
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Check tests - Windows ✅
Expand All @@ -103,7 +103,7 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }}
# This check name is defined as the github action job name (in .github/workflows/testing.yaml)
checkName: "Native build ubuntu-20.04 arm64 🦙"
checkName: "Native build ubuntu-22.04 arm64 🦙"
ref: ${{ github.event.pull_request.head.sha || github.sha }}

- name: Quality Gate ✅
Expand All @@ -130,7 +130,7 @@ jobs:
create-release:
name: Create Release ✨
needs: [quality-gate]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4
Expand Down Expand Up @@ -170,7 +170,7 @@ jobs:
scala-publish:
needs: [create-release]
name: Scala Publish API, Native and Server ✨
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4
Expand Down Expand Up @@ -208,7 +208,7 @@ jobs:
workflow: tests.yml
branch: main
workflow_conclusion: success
name: ubuntu-20.04-x64-libomega_edit.so
name: ubuntu-22.04-x64-libomega_edit.so
path: _install/libomega_edit_linux_amd64.so

- name: Download linux arm64 library file 🔻
Expand All @@ -217,7 +217,7 @@ jobs:
workflow: tests.yml
branch: main
workflow_conclusion: success
name: ubuntu-20.04-arm64-libomega_edit.so
name: ubuntu-22.04-arm64-libomega_edit.so
path: _install/libomega_edit_linux_aarch64.so

- name: Download macos-13 library file 🔻
Expand Down Expand Up @@ -323,7 +323,7 @@ jobs:

node-build:
name: Node Release ✨
runs-on: ubuntu-20.04 # NOTE: build on older OS versions to support older OS versions
runs-on: ubuntu-22.04 # NOTE: build on older OS versions to support older OS versions
needs: [scala-publish]
steps:
- name: Checkout 🛎️
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scala-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
build:
name: Scala Code Format
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout Current Branch (full) 🛎️
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scala-steward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:

jobs:
scala-steward:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Scala Steward 🔔
steps:
- name: Scala Steward 🔔
Expand Down
48 changes: 24 additions & 24 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-20.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,33 +37,33 @@ jobs:
with:
runner-os: ${{ runner.os }}
os-name: ${{ matrix.os }}-${{ env.runner_arch }}

build-native-linux-arm64:
name: Native build ubuntu-20.04 arm64 🦙
runs-on: ubuntu-20.04
name: Native build ubuntu-22.04 arm64 🦙
runs-on: ubuntu-22.04
steps:
- name: Checkout 🛎️
uses: actions/checkout@v4

- name: Build Native Linux arm64
uses: ./.github/workflows/build-native-docker
with:
os-name: ubuntu-20.04-arm64
docker-image: ghcr.io/ctc-oss/omega-edit-build-arm64:ubuntu-20.04
os-name: ubuntu-22.04-arm64
docker-image: ghcr.io/ctc-oss/omega-edit-build-arm64:ubuntu-22.04
library-filename: libomega_edit.so

build-middleware:
needs: [ build-native ]
needs: [build-native]
strategy:
matrix:
os: [ windows-2019, macos-13, ubuntu-20.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 @@ -79,15 +79,15 @@ jobs:
# TODO: Currently this action fails on sbt installM2 due to a timeout on sbt test 'should listen to session event'
# build-middleware-linux-arm64:
# needs: [ build-native-linux-arm64 ]
# runs-on: ubuntu-20.04
# name: Build middleware ubuntu-20.04 arm64 🔧
# runs-on: ubuntu-22.04
# name: Build middleware ubuntu-22.04 arm64 🔧
# steps:
# - name: Checkout 🛎️
# uses: actions/checkout@v4

# - name: Build Middleware ${{ matrix.os }}
# uses: ./.github/workflows/build-middleware-docker
# with:
# os-name: ubuntu-20.04-arm64
# docker-image: ghcr.io/ctc-oss/omega-edit-build-arm64:ubuntu-20.04
# os-name: ubuntu-22.04-arm64
# docker-image: ghcr.io/ctc-oss/omega-edit-build-arm64:ubuntu-22.04
# library-filename: libomega_edit.so
2 changes: 1 addition & 1 deletion .github/workflows/ts-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
build:
name: TypeScript code is properly formatted
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout current branch (full) 🛎️
uses: actions/checkout@v4
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 68fd271

Please sign in to comment.