Skip to content

Commit

Permalink
Merge pull request #229 from ThatConference/tickle-bot/fix/deploy
Browse files Browse the repository at this point in the history
fix: deployment: gcp deploy now running npm run build
  • Loading branch information
brettski authored May 2, 2023
2 parents 88b2761 + f4066e3 commit fdf048e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tickle-bot_PullRequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout PR
Expand Down
14 changes: 9 additions & 5 deletions .github/workflows/tickle-bot_PushMaster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -31,6 +31,7 @@ jobs:
run: |
cd functions/tickle-bot
pwd
npm pkg delete scripts.build
cp ./package.json __build__/
cp ./package-lock.json __build__/
git rev-list --count master > __build__/ccnt.txt
Expand All @@ -53,18 +54,21 @@ jobs:
deploy-image:
name: Deploy Ticklebot
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Download Build Artifact
uses: actions/download-artifact@v3
with:
name: tc-api
path: tc-api
- name: Setup google auth for github actions
uses: google-github-actions/auth@v1
with:
credentials_json: ${{ secrets.GCLOUD_AUTH }}
- name: Setup gcloud Actions
uses: google-github-actions/setup-gcloud@v0
uses: google-github-actions/setup-gcloud@v1
with:
version: '397.0.0'
service_account_key: ${{ secrets.GCLOUD_AUTH }}
version: '428.0.0'
project_id: ${{ secrets.GCP_PROJECT_ID }}
- name: write .env file
run: |
Expand Down
2 changes: 1 addition & 1 deletion functions/tickle-bot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tickle-bot",
"version": "2.5.3",
"version": "2.5.4",
"description": "Provides authenticated requests against our api",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit fdf048e

Please sign in to comment.