diff --git a/.github/workflows/csharp.yml b/.github/workflows/csharp.yml index 5239f3b9d7..a38c259b15 100644 --- a/.github/workflows/csharp.yml +++ b/.github/workflows/csharp.yml @@ -52,13 +52,6 @@ jobs: with: submodules: recursive - - name: Install redis - # TODO: make this step macos compatible: https://github.com/aws/glide-for-redis/issues/781 - if: ${{ matrix.os == 'ubuntu-latest' }} - uses: ./.github/workflows/install-redis - with: - redis-version: ${{ matrix.redis }} - - name: Install shared software dependencies uses: ./.github/workflows/install-shared-dependencies with: @@ -66,6 +59,11 @@ jobs: target: ${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-apple-darwin' }} github-token: ${{ secrets.GITHUB_TOKEN }} + - name: Install redis + uses: ./.github/workflows/install-redis + with: + redis-version: ${{ matrix.redis }} + - name: Set up dotnet ${{ matrix.dotnet }} uses: actions/setup-dotnet@v4 with: diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 805c46ba6c..5571a0800d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -58,8 +58,6 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} - name: Install redis - # TODO: make this step macos compatible: https://github.com/aws/glide-for-redis/issues/781 - if: ${{ matrix.os == 'ubuntu-latest' }} uses: ./.github/workflows/install-redis with: redis-version: ${{ matrix.redis }} @@ -120,11 +118,6 @@ jobs: target: "x86_64-unknown-linux-gnu" github-token: ${{ secrets.GITHUB_TOKEN }} - - name: Create a symbolic Link for redis6 binaries - run: | - ln -s /usr/bin/redis6-server /usr/bin/redis-server - ln -s /usr/bin/redis6-cli /usr/bin/redis-cli - - name: Install Go run: | yum -y install wget diff --git a/.github/workflows/install-redis/action.yml b/.github/workflows/install-redis/action.yml index f4a7491d04..76dddfe2ad 100644 --- a/.github/workflows/install-redis/action.yml +++ b/.github/workflows/install-redis/action.yml @@ -28,20 +28,18 @@ runs: ~/redis-binaries/${{ inputs.redis-version }}/redis-server key: ${{ runner.os }}-${{ inputs.redis-version }}-install-redis - - name: Install redis + - name: Build redis shell: bash if: steps.cache-redis.outputs.cache-hit != 'true' run: | - sudo apt-get update wget https://github.com/redis/redis/archive/${{ inputs.redis-version }}.tar.gz; tar -xzvf ${{ inputs.redis-version }}.tar.gz; - pushd redis-${{ inputs.redis-version }} && BUILD_TLS=yes make && sudo mv src/redis-server src/redis-cli ~/redis-binaries/${{ inputs.redis-version }} && popd; - - - name: Remove the source package - shell: bash - if: steps.cache-redis.outputs.cache-hit != 'true' - run: sudo rm -r redis-${{ inputs.redis-version }} + mkdir -p $HOME/redis-binaries/${{ inputs.redis-version }} + cd redis-${{ inputs.redis-version }} + BUILD_TLS=yes make + mv src/redis-server src/redis-cli $HOME/redis-binaries/${{ inputs.redis-version }} - - name: Copy executable to place + - name: Install redis shell: bash - run: sudo cp ~/redis-binaries/${{ inputs.redis-version }}/redis-server ~/redis-binaries/${{ inputs.redis-version }}/redis-cli /usr/bin/ + run: | + echo $HOME/redis-binaries/${{ inputs.redis-version }} >> $GITHUB_PATH diff --git a/.github/workflows/install-shared-dependencies/action.yml b/.github/workflows/install-shared-dependencies/action.yml index 42747ac0be..574acdac38 100644 --- a/.github/workflows/install-shared-dependencies/action.yml +++ b/.github/workflows/install-shared-dependencies/action.yml @@ -33,7 +33,7 @@ runs: run: | brew update brew upgrade || true - brew install git gcc pkgconfig openssl redis coreutils + brew install git gcc pkgconfig openssl coreutils - name: Install software dependencies for Ubuntu shell: bash @@ -46,7 +46,7 @@ runs: shell: bash if: "${{ inputs.os == 'amazon-linux' }}" run: | - yum install -y gcc pkgconfig openssl openssl-devel which curl redis6 gettext --allowerasing + yum install -y gcc pkgconfig openssl openssl-devel which curl gettext wget jemalloc-devel lua-devel make gcc tar gzip --allowerasing - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index c7e57b89dc..e7cadee3d3 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -71,8 +71,6 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - name: Install redis - # TODO: make this step macos compatible: https://github.com/aws/glide-for-redis/issues/781 - if: ${{ matrix.os == 'ubuntu-latest' }} uses: ./.github/workflows/install-redis with: redis-version: ${{ matrix.redis }} @@ -137,25 +135,21 @@ jobs: target: "x86_64-unknown-linux-gnu" github-token: ${{ secrets.GITHUB_TOKEN }} + - name: Install redis + uses: ./.github/workflows/install-redis + with: + redis-version: 6.2.14 + - name: Install protoc (protobuf) uses: arduino/setup-protoc@v3 with: version: "26.1" repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Create a symbolic Link for redis6 binaries - run: | - ln -s /usr/bin/redis6-server /usr/bin/redis-server - ln -s /usr/bin/redis6-cli /usr/bin/redis-cli - - name: Install Java run: | yum install -y java-${{ matrix.java }} - - name: Build rust part - working-directory: java - run: cargo build --release - - name: Build java part working-directory: java run: ./gradlew --continue build