Skip to content

Commit 731787a

Browse files
authored
chore(ci): fix automatic Actor build versioning (#381)
Fixes the missing pieces from #380 . Fixes the Camoufox scraper internals and dependencies.
1 parent 62fdb4d commit 731787a

File tree

4 files changed

+85
-45
lines changed

4 files changed

+85
-45
lines changed

.github/workflows/release-generic-actors.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,39 @@ jobs:
6060
matrix:
6161
settings:
6262
- actor: web-scraper
63-
stable-version: 3.0
63+
stable-version: '3.0'
6464
stable-build-tag: version-3
65-
development-version: 0.0
65+
development-version: '0.0'
6666
development-build-tag: development
6767
should-build: ${{ github.event.inputs.web-scraper }}
6868
- actor: cheerio-scraper
69-
stable-version: 3.0
69+
stable-version: '3.0'
7070
stable-build-tag: version-3
71-
development-version: 0.0
71+
development-version: '0.0'
7272
development-build-tag: development
7373
should-build: ${{ github.event.inputs.cheerio-scraper }}
7474
- actor: playwright-scraper
75-
stable-version: 1.0
75+
stable-version: '1.0'
7676
stable-build-tag: version-1
77-
development-version: 0.0
77+
development-version: '0.0'
7878
development-build-tag: development
7979
should-build: ${{ github.event.inputs.playwright-scraper }}
8080
- actor: puppeteer-scraper
81-
stable-version: 3.0
81+
stable-version: '3.0'
8282
stable-build-tag: version-3
83-
development-version: 0.0
83+
development-version: '0.0'
8484
development-build-tag: development
8585
should-build: ${{ github.event.inputs.puppeteer-scraper }}
8686
- actor: jsdom-scraper
87-
stable-version: 0.1
87+
stable-version: '0.1'
8888
stable-build-tag: latest
89-
development-version: 0.0
89+
development-version: '0.0'
9090
development-build-tag: development
9191
should-build: ${{ github.event.inputs.jsdom-scraper }}
9292
- actor: camoufox-scraper
93-
stable-version: 3.0
93+
stable-version: '3.0'
9494
stable-build-tag: version-3
95-
development-version: 0.0
95+
development-version: '0.0'
9696
development-build-tag: development
9797
should-build: ${{ github.event.inputs.camoufox-scraper }}
9898
steps:
@@ -108,21 +108,21 @@ jobs:
108108
if: matrix.settings.should-build == 'true'
109109
run: |
110110
if [ "${{ github.event.inputs.build-channel }}" = "stable" ]; then
111-
echo "version=${{ matrix.settings.stable-version }}\n" >> $GITHUB_ENV
112-
echo "build-tag=${{ matrix.settings.stable-build-tag }}\n" >> $GITHUB_ENV
111+
echo "version=${{ matrix.settings.stable-version }}" >> $GITHUB_ENV
112+
echo "build-tag=${{ matrix.settings.stable-build-tag }}" >> $GITHUB_ENV
113113
elif [ "${{ github.event.inputs.build-channel }}" = "development" ]; then
114-
echo "version=${{ matrix.settings.development-version }}\n" >> $GITHUB_ENV
115-
echo "build-tag=${{ matrix.settings.development-build-tag }}\n" >> $GITHUB_ENV
114+
echo "version=${{ matrix.settings.development-version }}" >> $GITHUB_ENV
115+
echo "build-tag=${{ matrix.settings.development-build-tag }}" >> $GITHUB_ENV
116116
else
117-
echo "version=${{ github.event.inputs.version }}\n" >> $GITHUB_ENV
118-
echo "build-tag=${{ github.event.inputs.build-tag }}\n" >> $GITHUB_ENV
117+
echo "version=${{ github.event.inputs.version }}" >> $GITHUB_ENV
118+
echo "build-tag=${{ github.event.inputs.build-tag }}" >> $GITHUB_ENV
119119
fi
120120
121121
- name: Build ${{ matrix.settings.actor }}
122122
uses: apify/push-actor-action@master
123123
if: matrix.settings.should-build == 'true'
124124
with:
125125
token: ${{ secrets.APIFY_ACTOR_BUILD_TOKEN }}
126-
build-tag: ${{ steps.calculate-versions.outputs.build-tag }}
127-
version: ${{ steps.calculate-versions.outputs.version }}
126+
build-tag: ${{ env.build-tag }}
127+
version: ${{ env.version }}
128128
working-directory: packages/actor-scraper/${{ matrix.settings.actor }}

package-lock.json

Lines changed: 63 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/actor-scraper/camoufox-scraper/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ RUN npm --quiet set progress=false \
2424
&& npm --version \
2525
&& rm -r ~/.npm
2626

27+
ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
2728
RUN npm run get-binaries
2829

2930
COPY --chown=myuser . ./

packages/actor-scraper/camoufox-scraper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@crawlee/playwright": "^3.13.2",
1111
"@crawlee/utils": "^3.13.2",
1212
"apify": "^3.2.6",
13-
"camoufox-js": "^0.3.0",
13+
"camoufox-js": "^0.3.4",
1414
"idcac-playwright": "^0.1.3",
1515
"playwright": "*"
1616
},

0 commit comments

Comments
 (0)