Skip to content

Commit

Permalink
final adoption on file list
Browse files Browse the repository at this point in the history
  • Loading branch information
OBoehrer committed Oct 18, 2024
1 parent 8af6bb7 commit 9ed0509
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 65 deletions.
78 changes: 19 additions & 59 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,14 @@ on:
- 'src/openstack_cpi_golang/**'

jobs:
go_lint:
name: Run golangci-lint
runs-on: [ solinas-medium ]
go:
strategy:
matrix:
os: [macos-latest, windows-2019, ubuntu-latest]
name: Run tests and Lint on ${{ matrix.os }}
runs-on: ${{ matrix.os }}

steps:
- uses: hmarr/debug-action@v2

- uses: actions/cache/restore@v4
name: Restore Repo from Actions Artifact Cache
with:
path: ${{ github.workspace }}
key: bosh-openstack-cpi-release-git-repo-cache

- name: Checkout code
uses: actions/checkout@v4

Expand All @@ -36,54 +31,19 @@ jobs:
run: |
go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
- name: Run golangci-lint
- name: Run golangci-lint and tests on Windows
if: ${{ matrix.os == 'windows-2019' }}
run: |
cd src/openstack_cpi_golang
golangci-lint run --enable goimports
unit_tests:
name: Run unit tests
runs-on: [ solinas-medium ]

steps:
- uses: hmarr/debug-action@v2

- uses: actions/cache/restore@v4
name: Restore Repo from Actions Artifact Cache
with:
path: ${{ github.workspace }}
key: bosh-openstack-cpi-release-git-repo-cache

- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: src/openstack_cpi_golang/go.mod
golangci-lint run
go test ./cpi/...
go test ./integration/...
- name: Run unit tests
run: ./src/openstack_cpi_golang/scripts/run-unit-tests
integration_tests:
name: Run integration tests
runs-on: [ solinas-medium ]

steps:
- uses: hmarr/debug-action@v2

- uses: actions/cache/restore@v4
name: Restore Repo from Actions Artifact Cache
with:
path: ${{ github.workspace }}
key: bosh-openstack-cpi-release-git-repo-cache

- name: Checkout code
uses: actions/checkout@v4

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: src/openstack_cpi_golang/go.mod

- name: Run integration tests
run: ./src/openstack_cpi_golang/scripts/run-integration-tests
- name: Run golangci-lint and tests on non-Windows
if: ${{ matrix.os != 'windows-2019' }}
run: |
cd src/openstack_cpi_golang
golangci-lint run --enable goimports
go test ./cpi/...
go test ./integration/...
shell: bash
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ releases/**/*.tgz
*#
#*
.vagrant
local/
bin/cpi
*.iml
2 changes: 1 addition & 1 deletion config/final.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ final_name: bosh-openstack-cpi
blobstore:
provider: s3
options:
bucket_name: bosh-openstack-cpi
bucket_name: bosh-openstack-cpi-blobs
2 changes: 1 addition & 1 deletion packages/golang-1-linux/spec.lock
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name: golang-1-linux
fingerprint: 04370ac17a8829676ddf8a96b55c043d5a94c326c177940a807ca7d59cb55fc7
fingerprint: 9558cab82cc598437084bfa9f169c53a77ed152b2632c4b83c4075144d30f338
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1 change: 0 additions & 1 deletion src/openstack_cpi_golang/.gitignore

This file was deleted.

0 comments on commit 9ed0509

Please sign in to comment.