Fix GOROOT and GOPATH when building package

cozy · Oct 16, 2023 · 0214978 · 0214978
1 parent 8617af9
commit 0214978
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,21 +16,21 @@ jobs:
       - name: Build the binaries
         run: |
           GOOS=linux   GOARCH=amd64 ./scripts/build.sh release
-          GOOS=linux   GOARCH=arm   ./scripts/build.sh release
-          GOOS=freebsd GOARCH=amd64 ./scripts/build.sh release
+        # GOOS=linux   GOARCH=arm   ./scripts/build.sh release
+        # GOOS=freebsd GOARCH=amd64 ./scripts/build.sh release
       - name: Create the release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           tag_name="${GITHUB_REF##*/}"
           gh release create "$tag_name" cozy-stack-* --target "$GITHUB_SHA"
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_SECRET }}
-      - name: Build and publish the cozy-app-dev image
-        run: scripts/release.sh
+      # - name: Login to Docker Hub
+      #   uses: docker/login-action@v3
+      #   with:
+      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
+      #     password: ${{ secrets.DOCKERHUB_SECRET }}
+      # - name: Build and publish the cozy-app-dev image
+      #   run: scripts/release.sh
   build_deb_packages:
     strategy:
       matrix:

diff --git a/scripts/packaging/buildpackage.sh b/scripts/packaging/buildpackage.sh
@@ -6,9 +6,9 @@ if command -v go > /dev/null; then
   eval "$(go env)"
   export GOROOT GOPATH
 else
-  export GOROOT="${GOROOT:-/tmp/go}"
-  export GOPATH="${GOPATH:-/tmp/goroot}"
-  export PATH="${GOPATH}/bin:$GOROOT/bin:${PATH}"
+  export GOROOT="${GOROOT:-/tmp/goroot}"
+  export GOPATH="${GOPATH:-/tmp/go}"
+  export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"
 fi
 
 cd "$(dirname $0)/../.."

diff --git a/scripts/packaging/installrequirements.sh b/scripts/packaging/installrequirements.sh
@@ -22,8 +22,9 @@ if [ -z "${SKIP_GO:-}" ]; then
   echo "Install GO"
   echo "=========="
   export GOROOT="${GOROOT:-/tmp/goroot}"
-  [ ! -d "/tmp/goroot" ] && mkdir -p "/tmp/goroot"
+  [ ! -d "${GOROOT}" ] && mkdir -p "${GOROOT}"
   export GOPATH="${GOPATH:-/tmp/go}"
+  [ ! -d "${GOPATH}" ] && mkdir -p "${GOPATH}"
   if [ ! -x "${GOROOT}/bin/go" ]; then
     echo ". download go archive"
     [ -f "go.tar.gz" ] || wget --quiet https://dl.google.com/go/go${GOVERSION}.linux-amd64.tar.gz -O /tmp/go.tar.gz
@@ -32,5 +33,5 @@ if [ -z "${SKIP_GO:-}" ]; then
     tar xf /tmp/go.tar.gz -C "${GOROOT}" --strip-components=1
     rm -rf /tmp/go.tar.gz
   fi
-  export PATH="${GOPATH}/bin:$GOROOT/bin:${PATH}"
+  export PATH="${GOPATH}/bin:${GOROOT}/bin:${PATH}"
 fi