Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI workflows. #1358

Closed
wants to merge 1 commit into from
Closed

Fix CI workflows. #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-node-wrapper/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ inputs:
type: string
options:
- amazon-linux
- macos-latest
- ubuntu-latest
- macos
- ubuntu
named_os:
description: "The name of the current operating system"
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-python-wrapper/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ inputs:
type: string
options:
- amazon-linux
- macos-latest
- ubuntu-latest
- macos
- ubuntu
target:
description: "Specified target for rust toolchain, ex. x86_64-apple-darwin"
type: string
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/csharp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- '8.0'
os:
- ubuntu-latest
- macos-latest
- macos-12
runs-on: ${{ matrix.os }}

steps:
Expand All @@ -62,7 +62,7 @@ jobs:
- name: Install shared software dependencies
uses: ./.github/workflows/install-shared-dependencies
with:
os: ${{ matrix.os }}
os: ${{ (contains(matrix.os, 'macos') && 'macos') || 'ubuntu' }}
target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -94,6 +94,8 @@ jobs:
benchmarks/results/*
utils/clusters/**

# TODO amazonlinux

lint-rust:
timeout-minutes: 10
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- 7.2.3
os:
- ubuntu-latest
- macos-latest
- macos-12

runs-on: ${{ matrix.os }}

Expand All @@ -53,7 +53,7 @@ jobs:
- name: Install shared software dependencies
uses: ./.github/workflows/install-shared-dependencies
with:
os: ${{ matrix.os }}
os: ${{ (contains(matrix.os, 'macos') && 'macos') || 'ubuntu' }}
target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/install-shared-dependencies/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ inputs:
type: string
options:
- amazon-linux
- macos-latest
- ubuntu-latest
- macos
- ubuntu
target:
description: "Specified target for rust toolchain, ex. x86_64-apple-darwin"
type: string
Expand All @@ -29,15 +29,15 @@ runs:
steps:
- name: Install software dependencies for macOS
shell: bash
if: "${{ inputs.os == 'macos-latest' }}"
if: "${{ contains(inputs.os, 'macos') }}"
run: |
brew update
brew upgrade || true
brew install git gcc pkgconfig openssl redis coreutils

- name: Install software dependencies for Ubuntu
shell: bash
if: "${{ inputs.os == 'ubuntu-latest' }}"
if: "${{ contains(inputs.os, 'ubuntu') }}"
run: |
sudo apt update -y
sudo apt install -y git gcc pkg-config openssl libssl-dev
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- 7.2.3
os:
- ubuntu-latest
- macos-latest
- macos-12

runs-on: ${{ matrix.os }}

Expand All @@ -60,7 +60,7 @@ jobs:
- name: Install shared software dependencies
uses: ./.github/workflows/install-shared-dependencies
with:
os: ${{ matrix.os }}
os: ${{ (contains(matrix.os, 'macos') && 'macos') || 'ubuntu' }}
target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }}
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/node-create-package-file/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ inputs:
type: string
options:
- amazon-linux
- macos-latest
- ubuntu-latest
- macos
- ubuntu
named_os:
description: "The name of the current operating system"
required: false
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Build Node wrapper
uses: ./.github/workflows/build-node-wrapper
with:
os: "ubuntu-latest"
os: "ubuntu"
target: "x86_64-unknown-linux-gnu"
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
name: lint node rust

build-macos-latest:
runs-on: macos-latest
runs-on: macos-12
timeout-minutes: 25
steps:
- uses: actions/checkout@v4
Expand All @@ -128,7 +128,7 @@ jobs:
- name: Build Node wrapper
uses: ./.github/workflows/build-node-wrapper
with:
os: "macos-latest"
os: "macos"
named_os: "darwin"
target: "x86_64-apple-darwin"
github-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
36 changes: 19 additions & 17 deletions .github/workflows/npm-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,18 @@ concurrency:

jobs:
start-self-hosted-runner:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Start self hosted EC2 runner
uses: ./.github/workflows/start-self-hosted-runner
with:
aws-access-key-id: ${{ secrets.AWS_EC2_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_EC2_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
ec2-instance-id: ${{ secrets.AWS_EC2_INSTANCE_ID }}
if: github.repository_owner == 'aws'
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Start self hosted EC2 runner
uses: ./.github/workflows/start-self-hosted-runner
with:
aws-access-key-id: ${{ secrets.AWS_EC2_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_EC2_SECRET_ACCESS_KEY }}
aws-region: ${{ secrets.AWS_REGION }}
ec2-instance-id: ${{ secrets.AWS_EC2_INSTANCE_ID }}

publish-binaries:
needs: start-self-hosted-runner
Expand All @@ -40,29 +41,29 @@ jobs:
matrix:
build:
- {
OS: ubuntu-latest,
OS: ubuntu,
NAMED_OS: linux,
RUNNER: ubuntu-latest,
ARCH: x64,
TARGET: x86_64-unknown-linux-gnu,
}
- {
OS: ubuntu-latest,
OS: ubuntu,
NAMED_OS: linux,
RUNNER: [self-hosted, Linux, ARM64],
ARCH: arm64,
TARGET: aarch64-unknown-linux-gnu,
CONTAINER: "2_28",
}
- {
OS: macos-latest,
OS: macos,
NAMED_OS: darwin,
RUNNER: macos-latest,
RUNNER: macos-12,
ARCH: x64,
TARGET: x86_64-apple-darwin,
}
- {
OS: macos-latest,
OS: macos,
NAMED_OS: darwin,
RUNNER: macos-13-xlarge,
arch: arm64,
Expand Down Expand Up @@ -152,6 +153,7 @@ jobs:
if-no-files-found: error

publish-base-to-npm:
if: github.event_name != 'pull_request'
name: Publish the base NPM package
needs: publish-binaries
runs-on: ubuntu-latest
Expand Down Expand Up @@ -188,7 +190,7 @@ jobs:
- name: Build Node wrapper
uses: ./.github/workflows/build-node-wrapper
with:
os: ubuntu-latest
os: ubuntu
target: "x86_64-unknown-linux-gnu"
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/pypi-cd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ concurrency:

jobs:
start-self-hosted-runner:
if: github.repository_owner == 'aws'
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -41,29 +42,29 @@ jobs:
matrix:
build:
- {
OS: ubuntu-latest,
OS: ubuntu,
NAMED_OS: linux,
RUNNER: ubuntu-latest,
ARCH: x64,
TARGET: x86_64-unknown-linux-gnu,
}
- {
OS: ubuntu-latest,
OS: ubuntu,
NAMED_OS: linux,
RUNNER: [self-hosted, Linux, ARM64],
ARCH: arm64,
TARGET: aarch64-unknown-linux-gnu,
CONTAINER: "2_28",
}
- {
OS: macos-latest,
OS: macos,
NAMED_OS: darwin,
RUNNER: macos-latest,
RUNNER: macos-12,
ARCH: x64,
TARGET: x86_64-apple-darwin,
}
- {
OS: macos-latest,
OS: macos,
NAMED_OS: darwin,
RUNNER: macos-13-xlarge,
arch: arm64,
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Build Python wrapper
uses: ./.github/workflows/build-python-wrapper
with:
os: "ubuntu-latest"
os: "ubuntu"
target: "x86_64-unknown-linux-gnu"
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
name: lint python-rust

build-macos-latest:
runs-on: macos-latest
runs-on: macos-12
timeout-minutes: 25
steps:
- uses: actions/checkout@v4
Expand All @@ -141,7 +141,7 @@ jobs:
- name: Build Python wrapper
uses: ./.github/workflows/build-python-wrapper
with:
os: "macos-latest"
os: "macos"
target: "x86_64-apple-darwin"
github-token: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Install shared software dependencies
uses: ./.github/workflows/install-shared-dependencies
with:
os: "ubuntu-latest"
os: "ubuntu"
target: "x86_64-unknown-linux-gnu"

- uses: dtolnay/rust-toolchain@stable
Expand Down
Loading