diff --git a/Makefile b/Makefile index a6d2f9c..495f761 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ clean: pretest: unzip chromium.zip -d _/amazon/code - npm install --prefix _/amazon/handlers puppeteer-core --bin-links=false --fund=false --omit=optional --omit=dev --package-lock=false --save=false + npm install --prefix _/amazon/handlers puppeteer-core@latest --bin-links=false --fund=false --omit=optional --omit=dev --package-lock=false --save=false test: sam local invoke --template _/amazon/template.yml --event _/amazon/events/example.com.json node16 diff --git a/_/ansible/inventory.ini b/_/ansible/inventory.ini index 8daa1b8..6ccd54c 100644 --- a/_/ansible/inventory.ini +++ b/_/ansible/inventory.ini @@ -14,4 +14,4 @@ instance_size=c6a.8xlarge ansible_connection=ssh ansible_python_interpreter=auto_silent ansible_ssh_private_key_file=ansible.pem -puppeteer_version=v18.0.5 +chromium_revision=1045629 diff --git a/_/ansible/plays/chromium.yml b/_/ansible/plays/chromium.yml index a959b00..053a483 100644 --- a/_/ansible/plays/chromium.yml +++ b/_/ansible/plays/chromium.yml @@ -181,17 +181,6 @@ path: /srv/source/chromium/.gclient register: gclient - - name: Resolving Puppeteer Version - uri: - url: "https://raw.githubusercontent.com/puppeteer/puppeteer/{{ puppeteer_version | default('main') }}/src/revisions.ts" - return_content: yes - register: puppeteer_revisions - - - name: Resolving Chromium Revision from Puppeteer Version - set_fact: - chromium_revision: > - {{ puppeteer_revisions.content | regex_search("chromium: [']([0-9]*)[']", '\1') | first }} - - name: Resolving Git Commit from Chromium Revision uri: url: "https://cr-rev.appspot.com/_ah/api/crrev/v1/redirect/{{ chromium_revision }}" diff --git a/incrementVersion b/incrementVersion deleted file mode 100755 index adf86cf..0000000 --- a/incrementVersion +++ /dev/null @@ -1,28 +0,0 @@ -# incrementVersion.sh OLD_VERSION NEW_VERSION -# Example: incrementVersion 16.1.0 16.2.0 - -OLD_VERSION=$1 -NEW_VERSION=$2 - -sed -i "s/$OLD_VERSION/$NEW_VERSION/" _/ansible/inventory.ini -sed -i "s/\"puppeteer-core\": \"$OLD_VERSION\"/\"puppeteer-core\": \"$NEW_VERSION\"/g" package.json -sed -i "s/puppeteer-core@$OLD_VERSION/puppeteer-core@$NEW_VERSION/" Makefile - -echo "Version number incremented $OLD_VERSION -> $NEW_VERSION. - -1) Check for a new version of 'chromium' included with 'puppeteer': - a) https://github.com/puppeteer/puppeteer/blob/main/src/revisions.ts - b) https://cr-rev.appspot.com/_ah/api/crrev/v1/redirect/####### - c) https://omahaproxy.appspot.com/ - -2) If the 'chromium' version has been incremented, please compile a new version of 'chromium': - a) cd _/ansible && make chromium - b) Rename the new chromium binary - -3) Please also update README.md#Versioning - -4) Merge the PR and deploy to npm - a) Test the new version using 'npm run test' - b) Push the PR to Github and merge it - c) Checkout the main branch - d) Run 'npm version $NEW_VERSION' to publish the package to npm."