Skip to content

Commit

Permalink
fix: reset versions in imported packages and run build on PR (#543)
Browse files Browse the repository at this point in the history
  • Loading branch information
tvanhens committed Oct 6, 2022
1 parent 9ffcd14 commit 9f54974
Show file tree
Hide file tree
Showing 66 changed files with 32 additions and 47 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Expand Up @@ -38,6 +38,11 @@ jobs:
- name: Install dependencies
run: yarn install --check-files

- name: Build Packages
run: yarn turbo run build -- --cache-dir=.turbo-cache
env:
NODE_OPTIONS: --max-old-space-size=6144

- name: Run tests
run: yarn turbo run test -- --cache-dir=.turbo-cache
env:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/release.yml
Expand Up @@ -18,22 +18,30 @@ jobs:
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set git identity
run: |-
git config user.name "github-actions"
git config user.email "github-actions@github.com"
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
role-to-assume: arn:aws:iam::593491530938:role/githubActionStack-githubactionroleA106E4DC-14SHKLVA61IN4
aws-region: us-east-1
role-duration-seconds: 3600
if: contains(fromJson('["release", "build", "close"]'), github.workflow)

- name: Install dependencies
run: yarn install --check-files --frozen-lockfile

- run: echo //registry.npmjs.org/:_authToken=${NPM_TOKEN} > .npmrc
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Build Packages
run: yarn run build

- name: release
run: yarn lerna publish --yes
env:
Expand Down
8 changes: 0 additions & 8 deletions CHANGELOG.md
Expand Up @@ -3,14 +3,6 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.4](https://github.com/functionless/functionless/compare/v0.24.3...v1.0.4) (2022-10-06)

**Note:** Version bump only for package functionless-monorepo





## [0.24.3](https://github.com/functionless/functionless/compare/v0.24.2...v0.24.3) (2022-10-05)


Expand Down
4 changes: 2 additions & 2 deletions apps/fl-exp-simple/package.json
@@ -1,9 +1,9 @@
{
"name": "simple",
"version": "0.1.0",
"version": "0.0.0",
"private": true,
"scripts": {
"typecheck": "tsc -b",
"typecheck": "tsc --noEmit",
"build": "npm run synth",
"deploy": "cdk deploy",
"local": "fl local",
Expand Down
2 changes: 1 addition & 1 deletion apps/fl-exp-simple/tsconfig.json
Expand Up @@ -12,7 +12,7 @@
"path": "../../packages/core"
},
{
"path": "../../packages/@functionless/fl-exp"
"path": "../../packages/fl-exp"
}
]
}
10 changes: 3 additions & 7 deletions lerna.json
Expand Up @@ -2,9 +2,7 @@
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
"packages/*"
],
"packages": ["packages/*"],
"conventionalCommits": true,
"commitHooks": false,
"private": false,
Expand All @@ -16,10 +14,8 @@
},
"publish": {
"npmClient": "npm",
"allowBranch": [
"main"
]
"allowBranch": ["main"]
}
},
"version": "1.0.4"
"version": "0.24.3"
}
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -6,13 +6,13 @@
"author": "Functionless Team",
"license": "Apache-2.0",
"scripts": {
"clean:deep": "git clean -fqdx .",
"build:website": "turbo run build --filter=website",
"lint": "turbo run lint",
"typecheck": "turbo run typecheck",
"build": "turbo run build",
"test": "turbo run test",
"prepare": "husky install",
"prepack": "npm run build"
"prepare": "husky install"
},
"workspaces": {
"packages": [
Expand Down
8 changes: 0 additions & 8 deletions packages/@functionless/fl-exp/CHANGELOG.md

This file was deleted.

3 changes: 0 additions & 3 deletions packages/@functionless/fl-exp/bin/cli.js

This file was deleted.

8 changes: 0 additions & 8 deletions packages/core/CHANGELOG.md
Expand Up @@ -3,14 +3,6 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.0.4](https://github.com/functionless/functionless/compare/v0.24.3...v1.0.4) (2022-10-06)

**Note:** Version bump only for package functionless





## [0.24.3](https://github.com/functionless/functionless/compare/v0.24.2...v0.24.3) (2022-10-05)


Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Expand Up @@ -94,7 +94,7 @@
},
"main": "lib/index.js",
"license": "Apache-2.0",
"version": "1.0.4",
"version": "0.24.3",
"jest": {
"collectCoverage": false,
"coveragePathIgnorePatterns": [
Expand Down
3 changes: 3 additions & 0 deletions packages/fl-exp/bin/cli.js
@@ -0,0 +1,3 @@
#!/usr/bin/env node

require("../lib/cli");
@@ -1,6 +1,6 @@
{
"name": "@functionless/fl-exp",
"version": "1.0.4",
"version": "0.0.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"bin": {
Expand Down Expand Up @@ -31,21 +31,21 @@
"functionless": "^0.24.0"
},
"devDependencies": {
"@aws-cdk/aws-appsync-alpha": "2.44.0-alpha.0",
"@aws-sdk/client-dynamodb": "*",
"@aws-cdk/aws-appsync-alpha": "2.44.0-alpha.0",
"@functionless/ast-reflection": "^0.3.1",
"@functionless/language-service": "^0.0.4",
"@swc/jest": "^0.2.22",
"@types/express": "^4.17.14",
"@types/jest": "^29.0.3",
"@types/node": "^18.7.18",
"@types/toposort": "^2.0.3",
"aws-cdk": "2.44.0",
"aws-cdk-lib": "2.44.0",
"aws-cdk": "2.44.0",
"aws-sdk": "^2",
"constructs": "10.0.0",
"esbuild": "0.15.9",
"functionless": "1.0.4",
"functionless": "*",
"jest": "^29.0.3",
"ts-node": "^10.9.1",
"tsconfig": "*",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
{
"extends": "../../../tsconfig-base.json",
"extends": "../../tsconfig-base.json",
"compilerOptions": {
"outDir": "lib",
"declaration": true,
Expand All @@ -10,7 +10,7 @@
"exclude": ["lib", "test", "node_modules"],
"references": [
{
"path": "../../core"
"path": "../core"
}
]
}
2 changes: 1 addition & 1 deletion tsconfig.json
@@ -1,7 +1,7 @@
{
"references": [
{ "path": "./packages/core" },
{ "path": "./packages/@functionless/fl-exp" },
{ "path": "./packages/fl-exp" },
{ "path": "./apps/fl-exp-simple" },
{ "path": "./apps/website" },
{ "path": "./apps/test-app" }
Expand Down

0 comments on commit 9f54974

Please sign in to comment.