-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-creds_process
Signed-off-by: Justin Alvarez <[email protected]>
- Loading branch information
Showing
105 changed files
with
2,935 additions
and
525 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,7 +28,7 @@ jobs: | |
| gen-code-no-diff: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: go.mod | ||
|
|
@@ -38,7 +38,7 @@ jobs: | |
| unit-tests: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| # Since this repository is not meant to be used as a library, | ||
|
|
@@ -50,7 +50,7 @@ jobs: | |
| go-linter: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: go.mod | ||
|
|
@@ -63,10 +63,20 @@ jobs: | |
| # so we will just update it manually whenever it makes sense (e.g., a feature that we want is added). | ||
| version: v1.53.3 | ||
| args: --fix=false --timeout=5m | ||
| shellcheck: | ||
| name: ShellCheck | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Run ShellCheck | ||
| uses: ludeeus/[email protected] | ||
| with: | ||
| version: v0.9.0 | ||
| continue-on-error: true | ||
| go-mod-tidy-check: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: go.mod | ||
|
|
@@ -77,7 +87,7 @@ jobs: | |
| check-licenses: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - uses: actions/setup-go@v4 | ||
| with: | ||
| go-version-file: go.mod | ||
|
|
@@ -96,7 +106,7 @@ jobs: | |
| ] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| # We need to get all the git tags to make version injection work. See VERSION in Makefile for more detail. | ||
| fetch-depth: 0 | ||
|
|
@@ -108,7 +118,7 @@ jobs: | |
| has_creds=${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name }} | ||
| echo "has_creds=$has_creds" >> $GITHUB_OUTPUT | ||
| - name: configure aws credentials | ||
| uses: aws-actions/configure-aws-credentials@v2.2.0 | ||
| uses: aws-actions/configure-aws-credentials@v4 | ||
| if: steps.vars.outputs.has_creds == true | ||
| with: | ||
| role-to-assume: ${{ secrets.ROLE }} | ||
|
|
@@ -139,64 +149,10 @@ jobs: | |
| git clean -f -d | ||
| REGISTRY=${{ steps.vars.outputs.has_creds == true && env.REGISTRY || '' }} make test-e2e | ||
| shell: zsh {0} | ||
| e2e-tests-for-docker-compat: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| os: | ||
| [ | ||
| [self-hosted, macos, amd64, 13, test], | ||
| [self-hosted, macos, arm64, 13, test], | ||
| ] | ||
| runs-on: ${{ matrix.os }} | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| # We need to get all the git tags to make version injection work. See VERSION in Makefile for more detail. | ||
| fetch-depth: 0 | ||
| persist-credentials: false | ||
| submodules: true | ||
| - name: Set output variables | ||
| id: vars | ||
| run: | | ||
| has_creds=${{ github.event_name == 'push' || github.repository == github.event.pull_request.head.repo.full_name }} | ||
| echo "has_creds=$has_creds" >> $GITHUB_OUTPUT | ||
| - name: configure aws credentials | ||
| uses: aws-actions/[email protected] | ||
| if: steps.vars.outputs.has_creds == true | ||
| with: | ||
| role-to-assume: ${{ secrets.ROLE }} | ||
| role-session-name: credhelper-test-docker-compat | ||
| aws-region: ${{ secrets.REGION }} | ||
| - name: Clean up previous files | ||
| run: | | ||
| sudo rm -rf /opt/finch | ||
| sudo rm -rf ~/.finch | ||
| sudo rm -rf ./_output | ||
| if pgrep '^qemu-system'; then | ||
| sudo pkill '^qemu-system' | ||
| fi | ||
| if pgrep '^socket_vmnet'; then | ||
| sudo pkill '^socket_vmnet' | ||
| fi | ||
| - name: Install Rosetta 2 | ||
| run: echo "A" | softwareupdate --install-rosetta || true | ||
| - run: brew install go lz4 automake autoconf libtool | ||
| shell: zsh {0} | ||
| - name: Build project | ||
| run: | | ||
| export PATH="/opt/homebrew/opt/libtool/libexec/gnubin:$PATH" | ||
| make | ||
| shell: zsh {0} | ||
| - run: | | ||
| git status | ||
| git clean -f -d | ||
| FINCH_DOCKER_COMPAT=1 REGISTRY=${{ steps.vars.outputs.has_creds == true && env.REGISTRY || '' }} make test-e2e | ||
| shell: zsh {0} | ||
| mdlint: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/checkout@v4 | ||
| - uses: avto-dev/markdown-lint@v1 | ||
| with: | ||
| args: '**/*.md' | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.