Skip to content

Commit

Permalink
Merge pull request #4 from bhaney/transfer-to-viamrobotics
Browse files Browse the repository at this point in the history
Transfer to viamrobotics
  • Loading branch information
bhaney authored Apr 11, 2024
2 parents 7c668ce + 35ffc20 commit ef0597b
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .canon.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-amd64-module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
4 changes: 2 additions & 2 deletions .github/workflows/build-arm64-module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

```
{
Expand Down Expand Up @@ -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
```

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/viam-labs/ocean-prefilter
module github.com/viamrobotics/ocean-prefilter

go 1.21.7

Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion meta.json
Original file line number Diff line number Diff line change
@@ -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": [
{
Expand Down

0 comments on commit ef0597b

Please sign in to comment.