Skip to content

Commit

Permalink
Merge pull request #1827 from Shopify/at-fix-protobuf
Browse files Browse the repository at this point in the history
Upgrade protobuf and update tests
  • Loading branch information
KaanOzkan committed Mar 20, 2024
2 parents 3e57203 + 18eb559 commit 1473020
Show file tree
Hide file tree
Showing 5 changed files with 808 additions and 1,526 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ jobs:
RAILS_VERSION: ${{ matrix.rails }}
steps:
- uses: actions/checkout@v4
- name: Install protobuf
run: |
curl -OL https://github.com/google/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip
unzip protoc-25.3-linux-x86_64.zip -d $HOME/.local
export PATH="$PATH:$HOME/.local/bin"
- name: Remove Gemfile.lock
# Remove Gemfile.lock for Ruby head builds and non-Rails current builds
if: ${{ matrix.ruby == 'head' || matrix.rails != 'current' }}
Expand Down
9 changes: 6 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,12 @@ GEM
activemodel
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (3.25.3-arm64-darwin)
google-protobuf (3.25.3-x86_64-darwin)
google-protobuf (3.25.3-x86_64-linux)
google-protobuf (4.26.0-arm64-darwin)
rake (>= 13)
google-protobuf (4.26.0-x86_64-darwin)
rake (>= 13)
google-protobuf (4.26.0-x86_64-linux)
rake (>= 13)
graphql (2.2.13)
base64
hashdiff (1.1.0)
Expand Down

0 comments on commit 1473020

Please sign in to comment.