Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
strategy:
matrix:
kubernetes_version:
- v1.27.3
- v1.28.0
- v1.35.0
- v1.34.3
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout repo
Expand All @@ -36,11 +36,11 @@ jobs:
with:
version: ${{ matrix.kubernetes_version }}

# Creates KinD with using k8s versions from the matrix above
- name: Set up kind with K8s version v1.22.4
# Creates kind using the Kubernetes versions from the matrix above
- name: Set up kind cluster
uses: engineerd/setup-kind@v0.5.0
with:
version: "v0.20.0"
version: "v0.31.0"
image: kindest/node:${{ matrix.kubernetes_version }}

- name: Testing kind cluster set-up
Expand All @@ -53,8 +53,8 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.24"
go-version: "1.25"

- name: Build devspacehelper
run: |
mkdir -p ~/.devspace/devspacehelper/latest
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.22"
- uses: actions/checkout@v3
go-version: "1.25"
- name: Run golangci-lint
uses: golangci/golangci-lint-action@v3.2.0
uses: golangci/golangci-lint-action@v7
with:
version: v2.11.4
only-new-issues: true
args:
-v
--config=.golangci.yml
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/npm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
linux:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 12
node-version: 20
registry-url: https://registry.npmjs.org/
- run: |
npm install -g
Expand All @@ -35,10 +35,10 @@ jobs:
windows:
runs-on: windows-2019
steps:
- uses: actions/checkout@v1
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 12
node-version: 20
registry-url: https://registry.npmjs.org/
- run: |
npm install -g
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.22"
go-version: "1.25"
- id: get_version
run: |
RELEASE_VERSION=$(echo $GITHUB_REF | sed -nE 's!refs/tags/!!p')
Expand Down
17 changes: 11 additions & 6 deletions .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,32 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.24"
go-version: "1.25"

- name: Check out code into the Go module directory
uses: actions/checkout@v1

- name: Test
run: ./hack/coverage.bash
shell: bash
run: |
source ./hack/remove-system-helm.sh
./hack/coverage.bash

test-unit-windows:
runs-on: windows-latest
name: unit-test-windows-latest

steps:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: "1.24"
go-version: "1.25"

- name: Check out code into the Go module directory
uses: actions/checkout@v1

- name: Test
run: ./hack/coverage.bash
shell: bash
run: |
source ./hack/remove-system-helm.sh
./hack/coverage.bash
27 changes: 12 additions & 15 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
version: "2"

run:
timeout: 10m

issues:
exclude-dirs:
- hack/
- docs/

linters:
disable-all: true
default: none
enable:
# - deadcode # deprecated https://github.com/golangci/golangci-lint/issues/1841
- gosimple
- govet
- ineffassign
- misspell
- unused
# - varcheck # deprecated https://github.com/golangci/golangci-lint/issues/1841
- staticcheck
- staticcheck # includes gosimple and stylecheck in v2
- errcheck
# - goimports
- dupl
- nakedret
- stylecheck
# - gofmt
# - golint
# - structcheck # deprecated https://github.com/golangci/golangci-lint/issues/1841

linters-settings:
gofmt:
simplify: true
dupl:
threshold: 400
settings:
dupl:
threshold: 400
exclusions:
paths:
- hack/
- docs/
- assets/assets.go
71 changes: 60 additions & 11 deletions assets/assets.go

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions dist/npm/bin/devspace
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ if [ ! -f "$BINARY" ] || [ "$STAT" -lt 10000 ]; then
INDEX_FILE="/index.js"

if [ ! -f "$BASEDIR/$INDEX_FILE" ]; then
BASEDIR="$(dirname $0)/../lib/node_modules/devspace"
BASEDIR="$(dirname $0)/../devspace"

if [ ! -f "$BASEDIR/$INDEX_FILE" ]; then
BASEDIR="$(dirname $0)/node_modules/devspace"
BASEDIR="$(dirname $0)/../lib/node_modules/devspace"

if [ ! -f "$BASEDIR/$INDEX_FILE" ]; then
BASEDIR=$(/usr/bin/env npm root -g)/devspace
BASEDIR="$(dirname $0)/node_modules/devspace"

if [ ! -f "$BASEDIR/$INDEX_FILE" ]; then
BASEDIR=$(/usr/bin/env npm root -g)/devspace

if [ ! -f "$BASEDIR/$INDEX_FILE" ]; then
BASEDIR=$(/usr/bin/env yarn global dir)/node_modules/devspace

Expand Down
22 changes: 13 additions & 9 deletions dist/npm/bin/devspace.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,28 @@ SET indexFile=\index.js
echo "!basedir!\!indexFile!"

IF NOT EXIST "!basedir!\!indexFile!" (
SET basedir=%~dp0\..\lib\node_modules\devspace
SET basedir=%~dp0\..\devspace

IF NOT EXIST "!basedir!\!indexFile!" (
SET basedir=%~dp0\node_modules\devspace
SET basedir=%~dp0\..\lib\node_modules\devspace

IF NOT EXIST "!basedir!\!indexFile!" (
FOR /F "tokens=* USEBACKQ" %%F IN (`npm root -g`) DO (
SET basedir=%%F\devspace
)
SET basedir=%~dp0\node_modules\devspace

IF NOT EXIST "!basedir!\!indexFile!" (
FOR /F "tokens=* USEBACKQ" %%F IN (`yarn global dir`) DO (
SET basedir=%%F\node_modules\devspace
FOR /F "tokens=* USEBACKQ" %%F IN (`npm root -g`) DO (
SET basedir=%%F\devspace
)

IF NOT EXIST "!basedir!\!indexFile!" (
echo Unable to find global npm/yarn dir
exit /b 1
FOR /F "tokens=* USEBACKQ" %%F IN (`yarn global dir`) DO (
SET basedir=%%F\node_modules\devspace
)

IF NOT EXIST "!basedir!\!indexFile!" (
echo Unable to find global npm/yarn dir
exit /b 1
)
)
)
)
Expand Down
Loading
Loading