Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/examples/typescript/…
Browse files Browse the repository at this point in the history
…vite-4.4.12
  • Loading branch information
usefulthink authored Dec 7, 2023
2 parents 709c63c + 8f59909 commit abf4804
Show file tree
Hide file tree
Showing 10 changed files with 2,104 additions and 1,825 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,17 @@ permissions:
jobs:
test:
uses: ./.github/workflows/test.yml

dependabot:
needs: test
runs-on: ubuntu-latest
if: ${{ github.actor == 'dependabot[bot]' }}

runs-on: ubuntu-latest
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.SYNCED_GITHUB_TOKEN_REPO}}
steps:
- name: approve
- name: Approve
run: gh pr review --approve "$PR_URL"
- name: merge
- name: Merge
run: gh pr merge --auto --squash --delete-branch "$PR_URL"
8 changes: 4 additions & 4 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'
cache: npm

- id: configure_pages
Expand Down Expand Up @@ -62,12 +62,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup node
uses: actions/setup-node@v3
with:
node-version: '18'
node-version: '20'
cache: npm

- name: Install dependencies
Expand Down
75 changes: 75 additions & 0 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

## Runs the release-please action for all new pushes to the main branch.
## This will create new release-PRs, create GitHub releases and update
## the CHANGELOG.md.

on:
push:
branches: [main]

permissions:
contents: write
pull-requests: write

name: Release Please

jobs:
release-please:
runs-on: ubuntu-latest
steps:
- id: release
name: Release Please
uses: google-github-actions/release-please-action@v3

with:
release-type: node
token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
package-name: "@googlemaps/adv-markers-utils"
bump-minor-pre-major: true

# Everything below is for NPM publishing when a release is cut.
# Note the "if" statement on all commands to make sure that publishing
# only happens when a release is cut.

- if: ${{ steps.release.outputs.release_created }}
name: Checkout
uses: actions/checkout@v3

- if: ${{ steps.release.outputs.release_created }}
name: Setup Node for Dependency Installation
uses: actions/setup-node@v3
with:
node-version: 20
cache: npm

- if: ${{ steps.release.outputs.release_created }}
name: Install Dependencies
run: npm ci

# Now configure node with the registry used for publishing
- if: ${{ steps.release.outputs.release_created }}
name: Setup Node for Publishing
uses: actions/setup-node@v3
with:
node-version: 20
registry-url: "https://wombat-dressing-room.appspot.com/"

- if: ${{ steps.release.outputs.release_created }}
name: Publish
# npm publish will trigger the build via the prepack hook
run: npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_WOMBAT_TOKEN }}
58 changes: 0 additions & 58 deletions .github/workflows/release.yml

This file was deleted.

26 changes: 14 additions & 12 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,22 @@
# limitations under the License.

name: Test
on:
- push
- pull_request
- workflow_call
on: [push, pull_request, workflow_call]
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
- name: Checkout
uses: actions/checkout@v4

- name: Setup Node
uses: actions/setup-node@v3
with:
path: ~/.npm
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-node-
- run: npm ci
- run: npm run test
node-version: 20
cache: npm

- name: Install Dependencies
run: npm ci

- name: Run Tests
run: npm run test
Loading

0 comments on commit abf4804

Please sign in to comment.