Skip to content

Commit

Permalink
fix(cd): sync EE change to properly restore cache for rpm
Browse files Browse the repository at this point in the history
  • Loading branch information
fffonion committed Apr 6, 2023
1 parent eff36a9 commit d2cd14a
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,17 +108,23 @@ jobs:
options: --privileged

steps:
- name: Early Rpm Setup
if: matrix.package == 'rpm'
run: |
# tar/gzip is needed to restore git cache (if available)
yum install -y tar gzip which file zlib-devel
- name: Cache Git
id: cache-git
if: matrix.label == 'centos-7' || matrix.label == 'rhel-7' || matrix.image == 'ubuntu:18.04'
if: matrix.package == 'rpm' || matrix.image == 'ubuntu:18.04'
uses: actions/cache@v3
with:
path: /usr/local/git
key: ${{ matrix.label }}-git-2.30.0

# el-7 doesn't have git 2.18+, so we need to install it manually
- name: Install newer Git
if: (matrix.label == 'centos-7' || matrix.label == 'rhel-7' || matrix.image == 'ubuntu:18.04') && steps.cache-git.outputs.cache-hit != 'true'
if: (matrix.package == 'rpm' || matrix.image == 'ubuntu:18.04') && steps.cache-git.outputs.cache-hit != 'true'
run: |
if which apt 2>/dev/null; then
apt update
Expand All @@ -137,29 +143,17 @@ jobs:
make install
- name: Add Git to PATH
if: matrix.label == 'centos-7' || matrix.label == 'rhel-7' || matrix.image == 'ubuntu:18.04'
if: matrix.package == 'rpm' || matrix.image == 'ubuntu:18.04'
run: |
echo "/usr/local/git/bin" >> $GITHUB_PATH
- name: Centos dependencies
if: matrix.label == 'centos-7' || matrix.label == 'rhel-7'
run: |
yum install -y which zlib-devel
- name: Debian dependencies
if: matrix.image == 'ubuntu:18.04'
run: |
apt update
# dependencies for git
apt install -y wget libz-dev libssl-dev libcurl4-gnutls-dev libexpat1-dev
- name: Early Amazon Linux Setup
if: startsWith(matrix.label, 'amazonlinux')
run: |
# tar/gzip is needed to restore git cache (if available)
yum check-updates -y || true
yum install -y tar gzip which file git zlib-devel
- name: Checkout Kong source code
uses: actions/checkout@v3

Expand Down

1 comment on commit d2cd14a

@khcp-gha-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bazel Build

Docker image available kong/kong:d2cd14acb3a8178ccfec6ef065fa619769ba9552
Artifacts available https://github.com/Kong/kong/actions/runs/4626244620

Please sign in to comment.