Skip to content

Commit

Permalink
Merge pull request #1032 from fabulous-dev/migrate-xf-and-maui
Browse files Browse the repository at this point in the history
Remove Fab.XF and Fab.MauiControls after migration to other repos
  • Loading branch information
TimLariviere authored Jan 5, 2023
2 parents 84f4321 + e7a4182 commit 53401a7
Show file tree
Hide file tree
Showing 814 changed files with 939 additions and 45,301 deletions.
4 changes: 2 additions & 2 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"version": 1,
"isRoot": true,
"tools": {
"fantomas-tool": {
"version": "4.5.11",
"fantomas": {
"version": "5.1.4",
"commands": [
"fantomas"
]
Expand Down
46 changes: 5 additions & 41 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ permissions: write-all

env:
VERSION: 2.1.0
SLN_FILE: Fabulous.sln

jobs:
xf:
name: Fabulous.XamarinForms
runs-on: macos-latest
env:
SLN_FILE: Fabulous.XamarinForms.NoSamples.sln
TEMPLATE_PROJ: templates/Xamarin.Forms/Fabulous.XamarinForms.Templates.proj
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup .NET
Expand All @@ -29,39 +26,6 @@ jobs:
- name: Test
run: dotnet test ${SLN_FILE} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} --no-build --configuration Release
- name: Pack
run: |
find templates -type f -name template.json | xargs sed -i bak "s/FABULOUS_PKG_VERSION/${VERSION}-nightly-${GITHUB_RUN_ID}/g"
dotnet pack ${SLN_FILE} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} --configuration Release --output nupkgs
dotnet pack ${TEMPLATE_PROJ} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} -p:IsNightlyBuild=true --configuration Release --output nupkgs
run: dotnet pack ${SLN_FILE} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} --configuration Release --output nupkgs
- name: Push
run: |
dotnet nuget push "nupkgs/*.nupkg" -s https://nuget.pkg.github.com/fabulous-dev/index.json -k ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
maui:
name: Fabulous.MauiControls
runs-on: macos-12
env:
SLN_FILE: Fabulous.MauiControls.NoSamples.sln
TEMPLATE_PROJ: templates/Maui/Fabulous.MauiControls.Templates.proj
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Install dotnet workload
run: dotnet workload install maui --from-rollback-file .github/workflows/maui-WorkloadManifest.json
- name: Restore
run: dotnet restore ${SLN_FILE}
- name: Build
run: dotnet build ${SLN_FILE} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} --no-restore --configuration Release
- name: Test
run: dotnet test ${SLN_FILE} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} --no-build --configuration Release
- name: Pack
run: |
find templates -type f -name template.json | xargs sed -i bak "s/FABULOUS_PKG_VERSION/${VERSION}-nightly-${GITHUB_RUN_ID}/g"
dotnet pack ${SLN_FILE} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} --configuration Release --output nupkgs
dotnet pack ${TEMPLATE_PROJ} -p:Version=${VERSION}-nightly-${GITHUB_RUN_ID} -p:IsNightlyBuild=true --configuration Release --output nupkgs
- name: Push
run: |
dotnet nuget push "nupkgs/*.nupkg" -s https://nuget.pkg.github.com/fabulous-dev/index.json -k ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
run: dotnet nuget push "nupkgs/*.nupkg" -s https://nuget.pkg.github.com/fabulous-dev/index.json -k ${{ secrets.GITHUB_TOKEN }} --skip-duplicate
92 changes: 47 additions & 45 deletions .github/workflows/gh_pages.yml
Original file line number Diff line number Diff line change
@@ -1,45 +1,47 @@
name: gh-pages

on:
push:
branches: ['v2.1']

jobs:
deploy:
runs-on: ubuntu-latest
steps:
# Check out the docs branch containing the Doks website
- name: Checkout docs branch
uses: actions/checkout@v3
with:
ref: docs

# Copy the content of the docs folder from v2.1 branch to docs branch
- name: Copy docs from v2.1
run: |
git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/v2.1*:refs/remotes/origin/v2.1*
git checkout --progress --force refs/remotes/origin/v2.1 -- docs
mv docs/content content
rm -r docs
# Build website
- uses: actions/setup-node@v2
with:
node-version: '16'
cache: 'npm'

- name: Install dependencies
run: npm install

- name: Check for linting errors
run: npm test

- name: Build production website
run: npm run build

# Deploy to GitHub Pages branch
- name: Deploy to GitHub Pages
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./public
### DISABLED UNTIL WEBSITE IS MIGRATED TO NEW REPO

# name: gh-pages

# on:
# push:
# branches: ['v2.1']

# jobs:
# deploy:
# runs-on: ubuntu-latest
# steps:
# # Check out the docs branch containing the Doks website
# - name: Checkout docs branch
# uses: actions/checkout@v3
# with:
# ref: docs

# # Copy the content of the docs folder from v2.1 branch to docs branch
# - name: Copy docs from v2.1
# run: |
# git -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/v2.1*:refs/remotes/origin/v2.1*
# git checkout --progress --force refs/remotes/origin/v2.1 -- docs
# mv docs/content content
# rm -r docs

# # Build website
# - uses: actions/setup-node@v2
# with:
# node-version: '16'
# cache: 'npm'

# - name: Install dependencies
# run: npm install

# - name: Check for linting errors
# run: npm test

# - name: Build production website
# run: npm run build

# # Deploy to GitHub Pages branch
# - name: Deploy to GitHub Pages
# uses: peaceiris/actions-gh-pages@v3
# with:
# github_token: ${{ secrets.GITHUB_TOKEN }}
# publish_dir: ./public
3 changes: 0 additions & 3 deletions .github/workflows/maui-WorkloadManifest.json

This file was deleted.

39 changes: 5 additions & 34 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
name: Pull Request
on: pull_request

env:
SLN_FILE: Fabulous.sln

jobs:
build:
runs-on: ubuntu-latest
Expand All @@ -13,42 +16,10 @@ jobs:
- name: Check code formatting
run: |
dotnet tool restore
dotnet fantomas --check -r src samples templates
xf:
name: Fabulous.XamarinForms
runs-on: macos-latest
env:
SLN_FILE: Fabulous.XamarinForms.NoSamples.sln
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Restore
run: dotnet restore ${SLN_FILE}
- name: Build
run: dotnet build ${SLN_FILE} --no-restore --configuration Release
- name: Test
run: dotnet test ${SLN_FILE} --no-build --configuration Release

maui:
name: Fabulous.MauiControls
runs-on: macos-12
env:
SLN_FILE: Fabulous.MauiControls.NoSamples.sln
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Install dotnet workload
run: dotnet workload install maui --from-rollback-file .github/workflows/maui-WorkloadManifest.json
dotnet fantomas --check -r src
- name: Restore
run: dotnet restore ${SLN_FILE}
- name: Build
run: dotnet build ${SLN_FILE} --no-restore --configuration Release
- name: Test
run: dotnet test ${SLN_FILE} --no-build --configuration Release
run: dotnet test ${SLN_FILE} --no-build --configuration Release
49 changes: 7 additions & 42 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,42 +6,13 @@ on:

permissions: write-all

jobs:
xf:
name: Fabulous.XamarinForms
runs-on: macos-latest
environment: nuget
env:
SLN_FILE: Fabulous.XamarinForms.NoSamples.sln
steps:
- uses: actions/checkout@v3
- name: Extract version from tag
uses: damienaicheh/[email protected]
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Restore
run: dotnet restore ${SLN_FILE}
- name: Build
run: dotnet build ${SLN_FILE} -p:Version="${MAJOR}.${MINOR}.${PATCH}" --no-restore --configuration Release
- name: Test
run: dotnet test ${SLN_FILE} -p:Version="${MAJOR}.${MINOR}.${PATCH}" --no-build --configuration Release
- name: Pack
run: |
find templates -type f -name template.json | xargs sed -i bak "s/FABULOUS_PKG_VERSION/${MAJOR}.${MINOR}.${PATCH}/g"
dotnet pack ${SLN_FILE} -p:Version="${MAJOR}.${MINOR}.${PATCH}" --configuration Release --output nupkgs
dotnet pack templates/Xamarin.Forms/Fabulous.XamarinForms.Templates.proj -p:Version="${MAJOR}.${MINOR}.${PATCH}" --configuration Release --output nupkgs
- name: Push
run: |
dotnet nuget push "nupkgs/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_TOKEN }} --skip-duplicate
env:
SLN_FILE: Fabulous.sln

maui:
name: Fabulous.MauiControls
runs-on: macos-12
jobs:
release:
runs-on: ubuntu-latest
environment: nuget
env:
SLN_FILE: Fabulous.MauiControls.NoSamples.sln
steps:
- uses: actions/checkout@v3
- name: Extract version from tag
Expand All @@ -50,19 +21,13 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Install dotnet workload
run: dotnet workload install maui --from-rollback-file .github/workflows/maui-WorkloadManifest.json
- name: Restore
run: dotnet restore ${SLN_FILE}
- name: Build
run: dotnet build ${SLN_FILE} -p:Version="${MAJOR}.${MINOR}.${PATCH}" --no-restore --configuration Release
- name: Test
run: dotnet test ${SLN_FILE} -p:Version="${MAJOR}.${MINOR}.${PATCH}" --no-build --configuration Release
- name: Pack
run: |
find templates -type f -name template.json | xargs sed -i bak "s/FABULOUS_PKG_VERSION/${MAJOR}.${MINOR}.${PATCH}/g"
dotnet pack ${SLN_FILE} -p:Version="${MAJOR}.${MINOR}.${PATCH}" --configuration Release --output nupkgs
dotnet pack templates/Maui/Fabulous.MauiControls.Templates.proj -p:Version="${MAJOR}.${MINOR}.${PATCH}" --configuration Release --output nupkgs
run: dotnet pack ${SLN_FILE} -p:Version="${MAJOR}.${MINOR}.${PATCH}" --configuration Release --output nupkgs
- name: Push
run: |
dotnet nuget push "nupkgs/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_TOKEN }} --skip-duplicate
run: dotnet nuget push "nupkgs/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_TOKEN }} --skip-duplicate
Loading

0 comments on commit 53401a7

Please sign in to comment.