Skip to content

Commit

Permalink
Merge branch 'beta'
Browse files Browse the repository at this point in the history
  • Loading branch information
brandonroberts committed Apr 4, 2024
2 parents 43d8bbf + cb49e78 commit fab595d
Show file tree
Hide file tree
Showing 21 changed files with 487 additions and 36 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,15 @@
"contributions": [
"doc"
]
},
{
"login": "leblancmeneses",
"name": "Leblanc Meneses",
"avatar_url": "https://avatars.githubusercontent.com/u/730804?v=4",
"profile": "http://www.robusthaven.com",
"contributions": [
"infra"
]
}
],
"contributorsPerLine": 7,
Expand Down
32 changes: 9 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,11 @@ env:
VITE_ANALOG_PUBLIC_BASE_URL: ${{ vars.VITE_ANALOG_PUBLIC_BASE_URL || 'http://localhost:3000' }}
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

jobs:
commitlint:
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
# Required by wagoid/commitlint-github-action
pull-requests: read
steps:
- uses: actions/checkout@v3
with:
# Required by wagoid/commitlint-github-action
fetch-depth: 0
- name: Lint commit messages
uses: wagoid/commitlint-github-action@v5
with:
failOnWarnings: true
helpURL: https://github.com/analogjs/analog/blob/main/CONTRIBUTING.md#-commit-message-guidelines
concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

jobs:
prettier:
runs-on: ubuntu-latest
steps:
Expand Down Expand Up @@ -155,8 +141,8 @@ jobs:
- name: Build
run: pnpm exec nx build docs-app
- name: Upload docs website
# Runs on merge to the `main` branch
if: github.event_name == 'push' && github.ref_name == 'main'
# Runs on merge to the `beta` branch
if: github.event_name == 'push' && github.ref_name == 'beta'
uses: actions/upload-artifact@v3
with:
if-no-files-found: error
Expand All @@ -172,8 +158,8 @@ jobs:
- unit
- e2e
- docs
# Runs on merge to the `main` branch
if: github.event_name == 'push' && github.ref_name == 'main'
# Runs on merge to the `beta` branch
if: github.event_name == 'push' && github.ref_name == 'beta'
runs-on: ubuntu-latest
environment:
name: github-pages
Expand All @@ -185,7 +171,7 @@ jobs:
id-token: write
concurrency:
# Group concurrency on workflow, then:
# - Is merge run? Group on branch name (`refs/heads/main`)
# - Is merge run? Group on branch name (`refs/heads/beta`)
# - Is pull request? Group on pull request branch name, for example `feat/add-awesome-feature`
group: >-
${{ github.workflow }}-deploy-docs-${{
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [1.1.1](https://github.com/analogjs/analog/compare/v1.1.0...v1.1.1) (2024-04-04)

### Bug Fixes

- add TanStack packages for SSR transform ([#998](https://github.com/analogjs/analog/issues/998)) ([0c5d1f6](https://github.com/analogjs/analog/commit/0c5d1f63458e5376cefd8cfb62c2c302bbf80c22))
- **vite-plugin-angular:** add support for output and model Signal API to Analog SFC ([#1004](https://github.com/analogjs/analog/issues/1004)) ([e212676](https://github.com/analogjs/analog/commit/e212676bb938a53fc59e933f68781e8a45d28cd3))

# [1.1.0](https://github.com/analogjs/analog/compare/v1.0.2...v1.1.0) (2024-04-02)

### Bug Fixes
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- prettier-ignore-start -->
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-90-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-91-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->
<!-- prettier-ignore-end -->

Expand Down Expand Up @@ -203,6 +203,7 @@ Thanks goes to these wonderful people for contributing to Analog ([emoji key](ht
<td align="center" valign="top" width="14.28%"><a href="https://a21.dev"><img src="https://avatars.githubusercontent.com/u/24437129?v=4?s=100" width="100px;" alt="Rafael Triantafillidis"/><br /><sub><b>Rafael Triantafillidis</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=alator21" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pi0"><img src="https://avatars.githubusercontent.com/u/5158436?v=4?s=100" width="100px;" alt="Pooya Parsa"/><br /><sub><b>Pooya Parsa</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=pi0" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://crutchcorn.dev"><img src="https://avatars.githubusercontent.com/u/9100169?v=4?s=100" width="100px;" alt="Corbin Crutchley"/><br /><sub><b>Corbin Crutchley</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=crutchcorn" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.robusthaven.com"><img src="https://avatars.githubusercontent.com/u/730804?v=4?s=100" width="100px;" alt="Leblanc Meneses"/><br /><sub><b>Leblanc Meneses</b></sub></a><br /><a href="#infra-leblancmeneses" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
</tr>
</tbody>
</table>
Expand Down
1 change: 1 addition & 0 deletions apps/docs-app/docs/contributors.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ Andres is a software engineer for HeroDevs, Angular and Firebase GDE.
<td align="center" valign="top" width="14.28%"><a href="https://a21.dev"><img src="https://avatars.githubusercontent.com/u/24437129?v=4?s=100" width="100px;" alt="Rafael Triantafillidis"/><br /><sub><b>Rafael Triantafillidis</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=alator21" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pi0"><img src="https://avatars.githubusercontent.com/u/5158436?v=4?s=100" width="100px;" alt="Pooya Parsa"/><br /><sub><b>Pooya Parsa</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=pi0" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://crutchcorn.dev"><img src="https://avatars.githubusercontent.com/u/9100169?v=4?s=100" width="100px;" alt="Corbin Crutchley"/><br /><sub><b>Corbin Crutchley</b></sub></a><br /><a href="https://github.com/analogjs/analog/commits?author=crutchcorn" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.robusthaven.com"><img src="https://avatars.githubusercontent.com/u/730804?v=4?s=100" width="100px;" alt="Leblanc Meneses"/><br /><sub><b>Leblanc Meneses</b></sub></a><br /><a href="#infra-leblancmeneses" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
</tr>
</tbody>
</table>
Expand Down
Loading

0 comments on commit fab595d

Please sign in to comment.