Skip to content

Commit a12ef34

Browse files
authored
Merge pull request #41 from sbidoul/fix-chrome-dl
Google Chrome deb files have moved
2 parents d559c1e + fe50ca3 commit a12ef34

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/workflows/ci.yaml

+9-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
schedule:
99
- cron: "0 4 * * *"
1010

11+
concurrency:
12+
group: ${{ github.ref }}
13+
cancel-in-progress: true
14+
1115
jobs:
1216
main:
1317
runs-on: ubuntu-latest
@@ -120,15 +124,15 @@ jobs:
120124
- 5432:5432
121125
steps:
122126
- name: Set up Docker Buildx
123-
uses: docker/setup-buildx-action@v1
127+
uses: docker/setup-buildx-action@v2
124128
- name: Login to ghcr.io
125-
uses: docker/login-action@v1
129+
uses: docker/login-action@v2
126130
with:
127131
registry: ghcr.io
128132
username: ${{ github.repository_owner }}
129133
password: ${{ secrets.GITHUB_TOKEN }}
130134
- name: Build image
131-
uses: docker/build-push-action@v2
135+
uses: docker/build-push-action@v3
132136
with:
133137
build-args: |
134138
python_version=${{ matrix.python_version }}
@@ -143,13 +147,13 @@ jobs:
143147
cache-to: type=local,dest=/tmp/.buildx-cache
144148
load: true
145149
- name: Checkout
146-
uses: actions/checkout@v2
150+
uses: actions/checkout@v3
147151
- name: Tests
148152
run: docker run -v ${PWD}/tests:/mnt/tests --network=host -e PGHOST=localhost ghcr.io/oca/oca-ci/${{ matrix.image_name }}:latest /mnt/tests/runtests.sh -v
149153
# Don't bother with Odoo 8 and 9 for now...
150154
if: ${{ matrix.odoo_version != '8.0' && matrix.odoo_version != '9.0' }}
151155
- name: Push image
152-
uses: docker/build-push-action@v2
156+
uses: docker/build-push-action@v3
153157
with:
154158
build-args: |
155159
python_version=${{ matrix.python_version }}

Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
3838
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq postgresql-client-12
3939

4040
# Install Google Chrome for browser tests
41-
ARG chrome_version=90.0.4430.93-1
42-
RUN curl -sSL https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${chrome_version}_amd64.deb -o /tmp/chrome.deb \
41+
RUN curl -sSL https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o /tmp/chrome.deb \
4342
&& apt-get -y install --no-install-recommends /tmp/chrome.deb \
4443
&& rm /tmp/chrome.deb
4544

0 commit comments

Comments
 (0)