Skip to content

Commit

Permalink
Merge pull request #3086 from orb-community/develop
Browse files Browse the repository at this point in the history
🚚 Release v0.30.0
  • Loading branch information
mfiedorowicz authored Aug 20, 2024
2 parents f533b9a + 5ac58d7 commit e9aa14c
Show file tree
Hide file tree
Showing 81 changed files with 1,368 additions and 2,154 deletions.
2 changes: 1 addition & 1 deletion .github/actions/go-lint/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-buster
FROM golang:1.22-alpine

LABEL author="Everton Haise Taques<[email protected]>"
LABEL maintainer="netboxlabs"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/go-report/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-alpine
FROM golang:1.22-alpine

LABEL author="Everton Haise Taques<[email protected]>"
LABEL maintainer="netboxlabs"
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
pktvisor_tag:
description: 'pktvisor agent docker tag to package'
default: "develop"
diode_tag:
description: 'diode agent docker tag to package'
default: "develop"
orb_tag:
description: 'orb agent docker tag to package'
default: "develop"
Expand All @@ -26,7 +23,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Get branch name
shell: bash
Expand Down Expand Up @@ -203,9 +200,9 @@ jobs:
shell: bash
run: |
if [ "${{ github.event.inputs.pktvisor_tag }}" == "" ]; then
DIODE_TAG=${{ env.REF_TAG }} PKTVISOR_TAG=${{ env.REF_TAG }} ORB_TAG=${{ env.REF_TAG }} make agent_full
PKTVISOR_TAG=${{ env.REF_TAG }} ORB_TAG=${{ env.REF_TAG }} make agent_full
else
DIODE_TAG=${{ github.event.inputs.diode_tag }} PKTVISOR_TAG=${{ github.event.inputs.pktvisor_tag }} ORB_TAG=${{ github.event.inputs.orb_tag }} make agent_full
PKTVISOR_TAG=${{ github.event.inputs.pktvisor_tag }} ORB_TAG=${{ github.event.inputs.orb_tag }} make agent_full
fi
- name: Login to Docker Hub orbcommunity
Expand Down
33 changes: 16 additions & 17 deletions .github/workflows/go-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
VERSION: ${{ env.VERSION }}
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down Expand Up @@ -100,7 +100,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
if: ${{ needs.prebuild.outputs.docs == 'true' && github.event_name != 'pull_request' }}
with:
token: ${{ secrets.GH_ORB_ACCESS_TOKEN }}
Expand All @@ -116,7 +116,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.agent == 'true' || github.event_name != 'pull_request' }}
Expand All @@ -140,7 +140,7 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ needs.prebuild.outputs.agent == 'true' || github.event_name != 'pull_request' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
version: "v0.1.15"
files: coverage.xml
Expand All @@ -155,7 +155,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
Expand All @@ -179,7 +179,7 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
version: "v0.1.15"
files: coverage.xml
Expand All @@ -194,7 +194,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
Expand All @@ -218,7 +218,7 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
version: "v0.1.15"
files: coverage.xml
Expand All @@ -233,7 +233,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
Expand All @@ -257,7 +257,7 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
version: "v0.1.15"
files: coverage.xml
Expand All @@ -272,7 +272,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
Expand All @@ -296,7 +296,7 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
version: "v0.1.15"
files: coverage.xml
Expand All @@ -311,7 +311,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
Expand All @@ -335,7 +335,7 @@ jobs:
- name: Upload coverage to Codecov
if: ${{ needs.prebuild.outputs.orb == 'true' || github.event_name != 'pull_request' }}
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
version: "v0.1.15"
files: coverage.xml
Expand Down Expand Up @@ -539,7 +539,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down Expand Up @@ -612,8 +612,7 @@ jobs:
package-migrate:
needs:
- package-ui-dependencies
- package-ui
- prebuild
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
46 changes: 38 additions & 8 deletions .github/workflows/go-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
VERSION: ${{ env.VERSION }}
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand All @@ -37,6 +37,11 @@ jobs:
- 'cmd/sinks/**'
- 'sinker/**'
- 'cmd/sinker/**'
- 'maestro/**'
- 'cmd/maestro/**'
migrate:
- 'migrate/**'
- 'cmd/migrate/**'
ui:
- 'ui/**'
- name: Set branch name
Expand Down Expand Up @@ -65,7 +70,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
run: SERVICE=agent make test_service
Expand All @@ -78,7 +83,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand All @@ -92,7 +97,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand All @@ -106,7 +111,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand All @@ -120,7 +125,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand All @@ -134,7 +139,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand Down Expand Up @@ -332,7 +337,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down Expand Up @@ -384,6 +389,30 @@ jobs:
run: |
docker push -a orbcommunity/orb-ui
package-migrate:
needs:
- prebuild
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Build orb migrate service image
if: ${{ needs.prebuild.outputs.migrate == 'true' }}
run: |
SERVICE=migrate make build_docker
- name: Login to Docker Hub orbcommunity
if: ${{ needs.prebuild.outputs.migrate == 'true' }}
uses: docker/login-action@v3
with:
username: ${{ secrets.ORB_DOCKERHUB_USERNAME }}
password: ${{ secrets.ORB_DOCKERHUB_TOKEN }}

- name: Push orb migrate service image orbcommunity
if: ${{ needs.prebuild.outputs.migrate == 'true' }}
run: |
docker push -a orbcommunity/orb-migrate
release:
needs:
- prebuild
Expand All @@ -392,6 +421,7 @@ jobs:
- package-sinker
- package-sinks
- package-ui
- package-migrate
runs-on: ubuntu-latest
# if this is a push into one of our main branches (rather than just a pull request), we will also package
if: github.event_name != 'pull_request'
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/go-production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
VERSION: ${{ env.VERSION }}
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.agent == 'true' }}
Expand All @@ -84,7 +84,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
run: |
Expand All @@ -100,7 +100,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand All @@ -114,7 +114,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand All @@ -128,7 +128,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
if: ${{ needs.prebuild.outputs.orb == 'true' }}
Expand All @@ -142,7 +142,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: '1.22'

- name: Go unit tests
run: |
Expand Down Expand Up @@ -353,7 +353,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@v2
- uses: dorny/paths-filter@v3
id: filter
with:
filters: |
Expand Down Expand Up @@ -559,7 +559,7 @@ jobs:
IMAGE_NAME: orbcommunity/orb-agent:latest
IMAGE_NAME_2: orbcommunity/orb-agent:${{ env.VERSION }}-${{ steps.commit_hash.outputs.sha_short }}

uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
build/*
localconfig/
.vscode/
python-test/.idea

**/.env

Expand Down
Loading

0 comments on commit e9aa14c

Please sign in to comment.