From 1aa81fb74ce3c956fb8d9cdd564b1d9b6005db8e Mon Sep 17 00:00:00 2001 From: Bijan Haney Date: Thu, 11 Apr 2024 01:34:11 -0400 Subject: [PATCH 1/2] ref name --- .github/workflows/build-amd64-module.yml | 2 +- .github/workflows/build-arm64-module.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-amd64-module.yml b/.github/workflows/build-amd64-module.yml index c3f1365..213b069 100644 --- a/.github/workflows/build-amd64-module.yml +++ b/.github/workflows/build-amd64-module.yml @@ -25,6 +25,6 @@ jobs: uses: viamrobotics/upload-module@v1 with: platform: linux/amd64 - version: ${{ github.event_name == 'release' && github.ref_name || format('0.0.0-{0}.{1}', github.ref_name, github.run_number) }} + version: ${{ github.ref_name }} key-id: ${{ secrets.viam_key_id }} key-value: ${{ secrets.viam_key_value }} diff --git a/.github/workflows/build-arm64-module.yml b/.github/workflows/build-arm64-module.yml index 9d7a680..c96b71c 100644 --- a/.github/workflows/build-arm64-module.yml +++ b/.github/workflows/build-arm64-module.yml @@ -25,6 +25,6 @@ jobs: uses: viamrobotics/upload-module@v1 with: platform: linux/arm64 - version: ${{ github.event_name == 'release' && github.ref_name || format('0.0.0-{0}.{1}', github.ref_name, github.run_number) }} + version: ${{ github.ref_name }} key-id: ${{ secrets.viam_key_id }} key-value: ${{ secrets.viam_key_value }} From 35ffc20365d4104ef5bc07ca3e979188fb20f870 Mon Sep 17 00:00:00 2001 From: Bijan Haney Date: Thu, 11 Apr 2024 14:50:24 -0400 Subject: [PATCH 2/2] move to viamrobotics --- .canon.yaml | 4 ++-- .github/workflows/build-amd64-module.yml | 2 +- .github/workflows/build-arm64-module.yml | 2 +- Makefile | 12 ++++++------ README.md | 4 ++-- go.mod | 2 +- main.go | 2 +- meta.json | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.canon.yaml b/.canon.yaml index 516163c..a8bf3d6 100644 --- a/.canon.yaml +++ b/.canon.yaml @@ -1,8 +1,8 @@ # This file provides project-level configuration for the canon dev environment utility. https://github.com/viamrobotics/canon ocean-prefilter: default: true - image_amd64: ghcr.io/viam-labs/ocean-prefilter:amd64 - image_arm64: ghcr.io/viam-labs/ocean-prefilter:arm64 + image_amd64: ghcr.io/viamrobotics/ocean-prefilter:amd64 + image_arm64: ghcr.io/viamrobotics/ocean-prefilter:arm64 user: testbot group: testbot persistent: true diff --git a/.github/workflows/build-amd64-module.yml b/.github/workflows/build-amd64-module.yml index 213b069..24aa019 100644 --- a/.github/workflows/build-amd64-module.yml +++ b/.github/workflows/build-amd64-module.yml @@ -13,7 +13,7 @@ jobs: name: Upload module for linux/amd64 runs-on: [ubuntu-latest] container: - image: ghcr.io/viam-labs/ocean-prefilter:amd64 + image: ghcr.io/viamrobotics/ocean-prefilter:amd64 options: --platform linux/amd64 timeout-minutes: 30 steps: diff --git a/.github/workflows/build-arm64-module.yml b/.github/workflows/build-arm64-module.yml index c96b71c..5674561 100644 --- a/.github/workflows/build-arm64-module.yml +++ b/.github/workflows/build-arm64-module.yml @@ -13,7 +13,7 @@ jobs: name: Upload module for linux/arm64 runs-on: [buildjet-2vcpu-ubuntu-2204-arm] container: - image: ghcr.io/viam-labs/ocean-prefilter:arm64 + image: ghcr.io/viamrobotics/ocean-prefilter:arm64 options: --platform linux/arm64 timeout-minutes: 30 steps: diff --git a/Makefile b/Makefile index 63b2cd0..ea8135c 100644 --- a/Makefile +++ b/Makefile @@ -39,31 +39,31 @@ docker-build: docker-arm64 docker-amd64 docker-upload: docker-upload-arm64 docker-upload-amd64 -docker-arm64: MAIN_TAG = ghcr.io/viam-labs/ocean-prefilter +docker-arm64: MAIN_TAG = ghcr.io/viamrobotics/ocean-prefilter docker-arm64: BUILD_TAG = arm64 docker-arm64: $(BUILD_CMD) -docker-amd64: MAIN_TAG = ghcr.io/viam-labs/ocean-prefilter +docker-amd64: MAIN_TAG = ghcr.io/viamrobotics/ocean-prefilter docker-amd64: BUILD_TAG = amd64 docker-amd64: $(BUILD_CMD) docker-upload-arm64: - docker push 'ghcr.io/viam-labs/ocean-prefilter:arm64' + docker push 'ghcr.io/viamrobotics/ocean-prefilter:arm64' docker-upload-amd64: - docker push 'ghcr.io/viam-labs/ocean-prefilter:amd64' + docker push 'ghcr.io/viamrobotics/ocean-prefilter:amd64' # CI targets that automatically push, avoid for local test-first-then-push workflows -docker-arm64-ci: MAIN_TAG = ghcr.io/viam-labs/ocean-prefilter +docker-arm64-ci: MAIN_TAG = ghcr.io/viamrobotics/ocean-prefilter docker-arm64-ci: BUILD_TAG = arm64 docker-arm64-ci: BUILD_PUSH = --push docker-arm64-ci: $(BUILD_CMD) # CI targets that automatically push, avoid for local test-first-then-push workflows -docker-amd64-ci: MAIN_TAG = ghcr.io/viam-labs/ocean-prefilter +docker-amd64-ci: MAIN_TAG = ghcr.io/viamrobotics/ocean-prefilter docker-amd64-ci: BUILD_TAG = amd64 docker-amd64-ci: BUILD_PUSH = --push docker-amd64-ci: diff --git a/README.md b/README.md index 4555176..4c3aca7 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ This vision service only returns one label classification called _TRIGGER_ with ## Config -You can download it from the viam Registry at [ocean-prefilter](https://app.viam.com/module/viam-labs/ocean-prefilter) +You can download it from the viam Registry at [ocean-prefilter](https://app.viam.com/module/viamrobotics/ocean-prefilter) ``` { @@ -43,7 +43,7 @@ git clone https://github.com/hybridgroup/gocv.git cd gocv sudo make install_raspi # or just sudo make install -git clone https://github.com/viam-labs/ocean-prefilter +git clone https://github.com/viamrobotics/ocean-prefilter make ocean-prefilter ``` diff --git a/go.mod b/go.mod index fc9dbe0..f91cd4e 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/viam-labs/ocean-prefilter +module github.com/viamrobotics/ocean-prefilter go 1.21.7 diff --git a/main.go b/main.go index 923a016..933e668 100644 --- a/main.go +++ b/main.go @@ -10,7 +10,7 @@ import ( "go.viam.com/rdk/module" "go.viam.com/utils" - "github.com/viam-labs/ocean-prefilter/oceanprefilter" + "github.com/viamrobotics/ocean-prefilter/oceanprefilter" ) func main() { diff --git a/meta.json b/meta.json index f0bae66..8027ace 100644 --- a/meta.json +++ b/meta.json @@ -1,7 +1,7 @@ { "module_id": "viam-labs:ocean-prefilter", "visibility": "public", - "url": "https://github.com/viam-labs/ocean-prefilter", + "url": "https://github.com/viamrobotics/ocean-prefilter", "description": "A module of the Viam vision service that implements a classifier used for filtering on objects in the ocean ", "models": [ {