Skip to content

Commit

Permalink
Merge pull request #33 from cdalvaro/cleanup/remove_support_for_armv7
Browse files Browse the repository at this point in the history
clean: Remove support for ARM v7
  • Loading branch information
cdalvaro authored Aug 8, 2020
2 parents 804a132 + 3da4124 commit c55e46e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
env:
GITHUB_REF_NAME: ${{ github.event.release.tag_name }}
IMAGE_NAME: cdalvaro/saltstack-master
PLATFORMS: linux/amd64 linux/arm64 linux/arm/v7
PLATFORMS: linux/amd64 linux/arm64
DOCKER_CLI_EXPERIMENTAL: enabled

jobs:
Expand Down
6 changes: 3 additions & 3 deletions assets/build/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ EOF

# Compile libssh2
echo "Building libssh2 v${LIBSSH2_VERSION} ..."
wget "https://github.com/libssh2/libssh2/archive/libssh2-${LIBSSH2_VERSION}.tar.gz" --no-check-certificate
wget "https://github.com/libssh2/libssh2/archive/libssh2-${LIBSSH2_VERSION}.tar.gz"
tar xzf "libssh2-${LIBSSH2_VERSION}.tar.gz"
cd "libssh2-libssh2-${LIBSSH2_VERSION}/"
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DENABLE_ZLIB_COMPRESSION=ON .
cmake --build . --target install

# Compile libgit2
echo "Building libgit2 v${LIBGIT2_VERSION} ..."
wget "https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz" --no-check-certificate
wget "https://github.com/libgit2/libgit2/archive/v${LIBGIT2_VERSION}.tar.gz"
tar xzf "v${LIBGIT2_VERSION}.tar.gz"
cd "libgit2-${LIBGIT2_VERSION}/"
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBUILD_CLAR=OFF -DTHREADSAFE=ON .
Expand Down Expand Up @@ -68,7 +68,7 @@ SALT_BOOTSTRAP_OPTS=( -M -N -X -d -P -p salt-api -p salt-call -x "python${PYTHON

echo "Installing saltstack ..."
echo "Option: ${SALT_BOOTSTRAP_OPTS[@]}"
wget -O bootstrap-salt.sh https://bootstrap.saltstack.com --no-check-certificate
wget -O bootstrap-salt.sh https://bootstrap.saltstack.com
sh bootstrap-salt.sh ${SALT_BOOTSTRAP_OPTS[@]} git "v${SALT_VERSION}"
chown -R "${SALT_USER}": "${SALT_ROOT_DIR}"

Expand Down

0 comments on commit c55e46e

Please sign in to comment.