Skip to content

Commit

Permalink
Merge branch 'main' into eddy/merge
Browse files Browse the repository at this point in the history
  • Loading branch information
byeongsu-hong authored Nov 27, 2023
2 parents d3e30b3 + ea08d3f commit 16283e1
Show file tree
Hide file tree
Showing 11 changed files with 196 additions and 413 deletions.
77 changes: 0 additions & 77 deletions .github/workflows/e2e.yml

This file was deleted.

65 changes: 0 additions & 65 deletions .github/workflows/mergify.yml.bak

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/monorepo-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
cancel-in-progress: true
jobs:
check-env:
runs-on: larger-runner
runs-on: ubuntu-latest
# assign output from step to job output
outputs:
gcloud-service-key: ${{ steps.gcloud-service-key.outputs.defined }}
Expand All @@ -27,7 +27,7 @@ jobs:
run: echo "::set-output name=defined::true"

build-and-push-to-gcr:
runs-on: larger-runner
runs-on: ubuntu-latest

# uses check-env to determine if secrets.GCLOUD_SERVICE_KEY is defined
needs: [check-env]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
contents: write
pull-requests: write
name: Release
runs-on: larger-runner
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rust-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:
cancel-in-progress: true
jobs:
check-env:
runs-on: larger-runner
runs-on: ubuntu-latest
# assign output from step to job output
outputs:
gcloud-service-key: ${{ steps.gcloud-service-key.outputs.defined }}
Expand All @@ -26,7 +26,7 @@ jobs:
run: echo "::set-output name=defined::true"

build-and-push-to-gcr:
runs-on: larger-runner
runs-on: ubuntu-latest

# uses check-env to determine if secrets.GCLOUD_SERVICE_KEY is defined
needs: [check-env]
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/rust-skipped.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@
name: rust

on:
push:
branches: [main]
pull_request:
branches: [main, v3]
branches: [main]
paths-ignore:
- 'rust/**'
- .github/workflows/rust.yml

env:
CARGO_TERM_COLOR: always

jobs:
test-rs:
runs-on: larger-runner
runs-on: ubuntu-latest

steps:
- run: 'echo "No test required" '

lint-rs:
runs-on: larger-runner
runs-on: ubuntu-latest

steps:
- run: 'echo "No lint required" '
3 changes: 1 addition & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: rust

on:
push:
branches: [main]
pull_request:
branches: [main]
paths:
- 'rust/**'
- .github/workflows/rust.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
slither:
runs-on: larger-runner
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
Expand Down
Loading

0 comments on commit 16283e1

Please sign in to comment.