Skip to content

Commit

Permalink
Merge branch 'tuist-3' into release/runtastic-3
Browse files Browse the repository at this point in the history
  • Loading branch information
Buju77 committed Feb 6, 2024
2 parents 1897570 + 3771c26 commit d629a49
Show file tree
Hide file tree
Showing 467 changed files with 9,200 additions and 5,012 deletions.
36 changes: 36 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -1237,6 +1237,42 @@
"contributions": [
"code"
]
},
{
"login": "dxmvsh",
"name": "Dimash",
"avatar_url": "https://avatars.githubusercontent.com/u/44325936?v=4",
"profile": "https://github.com/dxmvsh",
"contributions": [
"code"
]
},
{
"login": "danibachar",
"name": "danibachar",
"avatar_url": "https://avatars.githubusercontent.com/u/6380777?v=4",
"profile": "https://github.com/danibachar",
"contributions": [
"code"
]
},
{
"login": "dp221125",
"name": "한석호(MilKyo)",
"avatar_url": "https://avatars.githubusercontent.com/u/10572119?v=4",
"profile": "https://github.com/dp221125",
"contributions": [
"code"
]
},
{
"login": "haifengkao",
"name": "Hai Feng Kao",
"avatar_url": "https://avatars.githubusercontent.com/u/4080524?v=4",
"profile": "https://medium.com/@haifengkaohaifengkao&usg=AOvVaw2_xG-ZLdBawBIyS7m-99RQ",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
open_collective: tuistapp
github: tuist
custom: ["https://polar.sh/tuist"]
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Resolves https://github.com/tuist/tuist/issues/YYY
### Contributor checklist ✅

- [ ] The code has been linted using run `make workspace/lint-fix`
- [ ] The code has been linted using run `mise run lint:fix`
- [ ] The change is tested via unit testing or acceptance testing, or both
- [ ] The title of the PR is formulated in a way that is usable as a changelog entry
- [ ] In case the PR introduces changes that affect users, the documentation has been updated
Expand Down
File renamed without changes.
17 changes: 17 additions & 0 deletions .github/tuist-cloud-changelog-configuration.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"categories": [
{
"title": "#### Changed",
"labels": ["changelog:changed"]
},
{
"title": "#### Added",
"labels": ["changelog:added"]
},
{
"title": "#### Fixed",
"labels": ["changelog:fixed"]
}
],
"pr_template": "- ${{TITLE}} by [@${{AUTHOR}}](https://github.com/${{AUTHOR}})"
}
68 changes: 0 additions & 68 deletions .github/workflows/deploy-description-docc.yml

This file was deleted.

20 changes: 12 additions & 8 deletions .github/workflows/deploy-tuist-docc-dry-run.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
name: Deploy Tuist Docc dry-run
name: Deploy Tuist DocC dry-run

on:
push:
branches:
- main
pull_request:
paths:
- Package.swift
- Package.resolved
- Sources/**/*.docc
- Sources/ProjectDescription/**
- docs/**
- .github/workflows/deploy-tuist-docc-dry-run.yml

jobs:
Expand All @@ -18,7 +14,15 @@ jobs:
steps:
- name: Checkout Package
uses: actions/checkout@v3
- name: Checkout all tuist versions
uses: actions/checkout@v3
with:
fetch-depth: 0
path: tuist-archive
- name: Select Xcode
run: sudo xcode-select -switch /Applications/Xcode_$(cat .xcode-version).app
- uses: jdx/mise-action@v2
with:
experimental: true
- name: Build documentation
run: make docs/build
run: bash ./make/tasks/github/build-docc.sh
33 changes: 19 additions & 14 deletions .github/workflows/deploy-tuist-docc.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# Build and deploy DocC to GitHub pages. Based off of Pointfree's work here:
# Build and deploy DocC to GitHub pages. Based off of PointFree's work here:
# https://github.com/pointfreeco/swift-parsing/blob/main/.github/workflows/documentation.yml
name: Deploy Tuist Docc
name: Deploy Tuist DocC

on:
# release:
# types:
# - published
workflow_dispatch: {}
push:
branches:
- main
Expand All @@ -27,22 +25,29 @@ jobs:
step: start
- name: Checkout Package
uses: actions/checkout@v3
- name: Checkout all tuist versions
uses: actions/checkout@v3
with:
fetch-depth: 0
path: tuist-archive
- name: Select Xcode
run: sudo xcode-select -switch /Applications/Xcode_$(cat .xcode-version).app
- uses: jdx/mise-action@v2
with:
experimental: true
- name: Build documentation
run: make docs/build
run: bash ./make/tasks/github/build-docc.sh
- name: Fix permissions
run: 'sudo chown -R $USER .build/documentation'
- name: Deploy production to Netlify
uses: South-Paw/[email protected]
id: netlify
- name: Publish to Cloudflare Pages
uses: cloudflare/pages-action@v1
with:
args: 'deploy --json --prod --dir \"./.build/documentation\" --message \"production [${{ github.sha }}]\"'
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: cc0237353f2f825680b0463629cd4a86
projectName: tuist-docs
directory: .build/documentation
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
wranglerVersion: '3'
- name: Finish deployment
uses: bobheadxi/deployments@v1
if: always()
Expand All @@ -51,4 +56,4 @@ jobs:
step: finish
status: ${{ job.status }}
deployment_id: ${{ steps.deployment.outputs.deployment_id }}
env_url: ${{ steps.netlify.outputs.NETLIFY_PROD_URL }}
env_url: "https://docs.tuist.io"
Loading

0 comments on commit d629a49

Please sign in to comment.