diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index b6a9403..7bbf8fc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "Go", - "image": "mcr.microsoft.com/devcontainers/go:1.20", + "image": "mcr.microsoft.com/devcontainers/go:1.21", // alternative: use the bullseye image // "image": "mcr.microsoft.com/devcontainers/go:1.20-bullseye", "runArgs": [ @@ -26,7 +26,9 @@ }, "[go]": { "editor.rulers": [90] - } + }, + "editor.defaultFormatter": "golang.go", + "editor.formatOnSave": true }, // Add the IDs of extensions you want installed when the container is created. "extensions": [ @@ -35,7 +37,8 @@ "esbenp.prettier-vscode", "github.vscode-pull-request-github", "EditorConfig.EditorConfig", - "cschleiden.vscode-github-actions" + "cschleiden.vscode-github-actions", + "GitHub.copilot" ] } }, @@ -53,7 +56,7 @@ // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode", "features": { - "ghcr.io/devcontainers/features/docker-in-docker": "20.10", + "ghcr.io/devcontainers/features/docker-in-docker": "latest", "ghcr.io/devcontainers-contrib/features/pre-commit": "latest" } } diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 462be0c..4ec0362 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -21,7 +21,7 @@ jobs: golangci-lint: strategy: matrix: - go-version: [1.20.x] + go-version: [1.21.x] os: [ubuntu-latest] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index db07a00..d2e240a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v3 with: - go-version: "1.20" + go-version: "1.21" - name: Login to Github Container Registry uses: docker/login-action@v2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7d5a1cc..bd7bfeb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,16 +4,16 @@ on: workflow_dispatch: push: branches: - - '**' + - "**" pull_request: - types: [ opened, reopened ] + types: [opened, reopened] jobs: tests: strategy: matrix: - go-version: [ 1.20.x ] - os: [ ubuntu-latest ] + go-version: [1.21.x] + os: [ubuntu-latest] runs-on: ${{ matrix.os }} diff --git a/go.mod b/go.mod index 8019121..457f3a9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mpapenbr/iracelog-wamp-router -go 1.20 +go 1.21 require ( github.com/gammazero/nexus/v3 v3.2.1 diff --git a/setuplinks.sh b/setuplinks.sh index e91448a..cd9de7c 100755 --- a/setuplinks.sh +++ b/setuplinks.sh @@ -8,16 +8,18 @@ if [ ! -e $HOME/.gitconfig.local ]; then fi fi +# linking .cobra.yaml +if [ ! -e $HOME/.cobra.yaml ]; then + if [ -f $PWD/.cobra.yaml ]; then + echo "Linking .cobra.yaml" + ln -s $PWD/.cobra.yaml $HOME/.cobra.yaml + fi +fi + # linking .npmrc if [ ! -e $HOME/.npmrc ]; then - if [ -f .npmrc ]; then + if [ -f $PWD/.npmrc ]; then echo "Linking .npmrc" ln -s $PWD/.npmrc $HOME/.npmrc fi fi - -# linking .cobra.yaml -if [ ! -e $HOME/.cobra.yaml ]; then - echo "Linking .cobra.yaml" - ln -s $PWD/.cobra.yaml $HOME/.cobra.yaml -fi