Skip to content

Commit

Permalink
Only pin the few jobs that seem to need 18.04
Browse files Browse the repository at this point in the history
Signed-off-by: Jesse Szwedko <[email protected]>
  • Loading branch information
jszwedko committed Feb 12, 2021
1 parent 5c06e50 commit 9309109
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/benches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:

jobs:
cancel-previous:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
timeout-minutes: 3
if: github.ref != 'refs/heads/master'
steps:
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
needs:
- cancel-previous
- bench
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Discord notification
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:

jobs:
publish-new-environment:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/install-sh.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
sync-install:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: sudo apt-get install --yes python3-setuptools python3.6-dev
Expand All @@ -25,7 +25,7 @@ jobs:
test-install:
needs:
- sync-install
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- run: sudo apt-get install --yes curl bc
- run: curl --proto '=https' --tlsv1.2 -sSf https://sh.vector.dev | bash -s -- -y
Expand All @@ -37,7 +37,7 @@ jobs:
needs:
- sync-install
- test-install
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Discord notification
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ jobs:
- test-integration-loki
- test-integration-pulsar
- test-integration-splunk
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Discord notification
env:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/k8s_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# See https://github.community/t/feature-request-and-use-case-example-to-allow-matrix-in-if-s/126067
compute-k8s-test-plan:
name: Compute K8s test plan
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
if: |
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:

test-e2e-kubernetes:
name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }})
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs:
- build-x86_64-unknown-linux-gnu
- compute-k8s-test-plan
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
- build-x86_64-unknown-linux-gnu
- compute-k8s-test-plan
- test-e2e-kubernetes
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Discord notification
env:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

jobs:
build-x86_64-unknown-linux-musl-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV
Expand All @@ -28,7 +28,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl.tar.gz"

build-x86_64-unknown-linux-gnu-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -50,7 +50,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm"

build-aarch64-unknown-linux-musl-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -73,7 +73,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.aarch64.rpm"

build-aarch64-unknown-linux-gnu-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -88,7 +88,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu.tar.gz"

build-armv7-unknown-linux-gnueabihf-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -110,7 +110,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.armv7.rpm"

build-armv7-unknown-linux-musleabihf-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
deb-verify:
needs:
- build-x86_64-unknown-linux-gnu-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
container: ["ubuntu:14.04","ubuntu:16.04","ubuntu:18.04","ubuntu:20.04","debian:8","debian:9","debian:10"]
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
rpm-verify:
needs:
- build-x86_64-unknown-linux-gnu-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
container: ["centos:7","centos:8","amazonlinux:1","amazonlinux:2","fedora:33"]
Expand Down Expand Up @@ -428,7 +428,7 @@ jobs:
run: make release-s3

release-cloudsmith:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs:
- build-x86_64-unknown-linux-gnu-packages
- build-aarch64-unknown-linux-musl-packages
Expand Down Expand Up @@ -576,7 +576,7 @@ jobs:
- deb-verify
- rpm-verify
- osx-verify
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Discord notification
env:
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ env:

jobs:
build-x86_64-unknown-linux-musl-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV
Expand All @@ -29,7 +29,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-x86_64-unknown-linux-musl.tar.gz"

build-x86_64-unknown-linux-gnu-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -51,7 +51,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.x86_64.rpm"

build-aarch64-unknown-linux-musl-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -74,7 +74,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.aarch64.rpm"

build-aarch64-unknown-linux-gnu-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -89,7 +89,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-aarch64-unknown-linux-gnu.tar.gz"

build-armv7-unknown-linux-gnueabihf-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: make ci-sweep
Expand All @@ -111,7 +111,7 @@ jobs:
path: "./target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.armv7.rpm"

build-armv7-unknown-linux-musleabihf-packages:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v1
- run: echo VECTOR_VERSION=$(make version) >> $GITHUB_ENV
Expand Down Expand Up @@ -213,7 +213,7 @@ jobs:
deb-verify:
needs:
- build-x86_64-unknown-linux-gnu-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
container: ["ubuntu:14.04","ubuntu:16.04","ubuntu:18.04","ubuntu:20.04","debian:8","debian:9","debian:10"]
Expand Down Expand Up @@ -245,7 +245,7 @@ jobs:
rpm-verify:
needs:
- build-x86_64-unknown-linux-gnu-packages
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
strategy:
matrix:
container: ["centos:7","centos:8","amazonlinux:1","amazonlinux:2","fedora:33"]
Expand Down Expand Up @@ -291,7 +291,7 @@ jobs:
tar -xvf target/artifacts/vector-${{ env.VECTOR_VERSION }}-x86_64-apple-darwin.tar.gz && vector-x86_64-apple-darwin/bin/vector --version
release-docker:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs:
- build-aarch64-unknown-linux-musl-packages
- build-x86_64-unknown-linux-gnu-packages
Expand Down Expand Up @@ -347,7 +347,7 @@ jobs:
make release-docker
release-s3:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs:
- build-x86_64-unknown-linux-gnu-packages
- build-x86_64-unknown-linux-musl-packages
Expand Down Expand Up @@ -530,7 +530,7 @@ jobs:
make release-homebrew
release-cloudsmith:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs:
- build-x86_64-unknown-linux-gnu-packages
- build-aarch64-unknown-linux-musl-packages
Expand Down Expand Up @@ -644,7 +644,7 @@ jobs:
file: "target/artifacts/vector-${{ env.VECTOR_VERSION }}-1.armv7.rpm"

release-helm:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
needs:
# This is not strictly required, but ensures that Helm Chart doesn't
# appear before the image it refers to.
Expand Down Expand Up @@ -679,7 +679,7 @@ jobs:
- release-cloudsmith
- release-github
- release-helm
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Discord notification
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-harness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
jobs:
test-harness:

runs-on: ubuntu-18.04
runs-on: ubuntu-20.04

needs: version

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
access_token: ${{ secrets.GITHUB_TOKEN }}

changes:
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
# Set job outputs to values from filter step
outputs:
source: ${{ steps.filter.outputs.source }}
Expand Down Expand Up @@ -287,7 +287,7 @@ jobs:
- test-windows
- check-component-features
- checks
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Discord notification
env:
Expand Down

0 comments on commit 9309109

Please sign in to comment.