Skip to content

Commit 329e85b

Browse files
Update kamal script with linux and macos command versions
1 parent f75bda7 commit 329e85b

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

.github/workflows/deploy.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ on:
77

88

99
jobs:
10-
# checks:
11-
# uses: ./.github/workflows/checks.yaml
10+
checks:
11+
uses: ./.github/workflows/checks.yaml
1212

1313
deploy:
1414
runs-on: ubuntu-latest
1515
permissions:
1616
contents: read
1717
packages: write
1818
timeout-minutes: 20
19-
# needs: [ checks ]
19+
needs: [ checks ]
2020
steps:
2121
- uses: actions/checkout@v4
2222
- uses: webfactory/[email protected]

.tool-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ java temurin-21.0.2+13.0.LTS
33
clojure 1.11.3.1463
44
node 16.16.0
55
cljstyle 0.16.626
6-
clj-kondo 2024.03.13
6+
clj-kondo 2024.05.22

kamal-ci.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

kamal.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11
#!/bin/bash
22

3+
OS=$(uname)
34
KAMAL_VERSION=v1.5.2
4-
docker run -it --rm -v "${PWD}:/workdir" -v "/run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock" -e SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock" -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/basecamp/kamal:${KAMAL_VERSION} "$@"
5+
6+
if [[ "$OS" == "Linux" ]]; then
7+
docker run -it --rm -v "${PWD}:/workdir" -v "${SSH_AUTH_SOCK}:/ssh-agent" -v /var/run/docker.sock:/var/run/docker.sock -e "SSH_AUTH_SOCK=/ssh-agent" ghcr.io/basecamp/kamal:${KAMAL_VERSION} "$@"
8+
elif [[ "$OS" == "Darwin" ]]; then
9+
docker run -it --rm -v "${PWD}:/workdir" -v "/run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock" -e SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock" -v /var/run/docker.sock:/var/run/docker.sock ghcr.io/basecamp/kamal:${KAMAL_VERSION} "$@"
10+
else
11+
echo "Unsupported OS"
12+
fi

0 commit comments

Comments
 (0)