Skip to content

Commit

Permalink
Merge branch 'main' into mahesh/fluent_swiftUI
Browse files Browse the repository at this point in the history
  • Loading branch information
maheshwaran01m authored Sep 12, 2024
2 parents 076b171 + 3255f2f commit 6b5644a
Show file tree
Hide file tree
Showing 5,642 changed files with 99,736 additions and 26,725 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 16 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## packages
packages/icon-app @tomi-msft
packages/react-icons @tomi-msft @behowell
packages/react-icons-font-subsetting-plugin @tomi-msft @MLoughry
packages/svg-icons @tomi-msft
packages/svg-sprites @tomi-msft
packages/react-native-icons @praveen970


## Build Systems
android/ @praveen970
flutter/ @nickromano
ios/ @nickromano

## Assets
assets/ @spencer-nelson @willchavez
167 changes: 81 additions & 86 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,44 +188,39 @@ jobs:
access: public
package: packages/react-icons-font-subsetting-webpack-plugin/package.json

- name: Build React-Native library
run: |
npm run build
working-directory: packages/react-native-icons

- uses: JS-DevTools/npm-publish@v1
with:
token: ${{ secrets.NPM_TOKEN }}
access: public
package: packages/react-native-icons/package.json

## Android
- name: Run Android generate script
env:
# see https://github.com/JS-DevTools/npm-publish/issues/15
INPUT_TOKEN: ''
run: npm run deploy:android
working-directory: importer
# - name: Run Android generate script
# env:
# # see https://github.com/JS-DevTools/npm-publish/issues/15
# INPUT_TOKEN: ''
# run: npm run deploy:android
# working-directory: importer

- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: 8
# - name: Setup Java
# uses: actions/setup-java@v1
# with:
# java-version: 8

- name: Base64 decodes and pipes the GPG key content into the secret file
env:
GPG_KEY_CONTENT: ${{ secrets.GPG_KEY_CONTENT }}
SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
run: |
git fetch --unshallow
sudo bash -c "echo '$GPG_KEY_CONTENT' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"
# - name: Base64 decodes and pipes the GPG key content into the secret file
# env:
# GPG_KEY_CONTENT: ${{ secrets.GPG_KEY_CONTENT }}
# SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
# run: |
# git fetch --unshallow
# sudo bash -c "echo '$GPG_KEY_CONTENT' | base64 -d > '$SIGNING_SECRET_KEY_RING_FILE'"

- name: Build Android library
uses: eskatos/gradle-command-action@v1
with:
arguments: assembleRelease -DversionName='${{ env.NEW_VERSION }}'
build-root-directory: android
wrapper-directory: android
# - name: Build Android library
# uses: eskatos/gradle-command-action@v1
# with:
# arguments: assembleRelease -DversionName='${{ env.NEW_VERSION }}'
# build-root-directory: android
# wrapper-directory: android

# Temporarily commenting out the publishing to Maven Central, as it is blocking the release for other platforms
# - name: Publish to Maven Central
Expand All @@ -243,9 +238,9 @@ jobs:
# build-root-directory: android
# wrapper-directory: android

- name: Generate BUILD.gn file for Android
run: python3 generate_build_gn_android.py
working-directory: importer
# - name: Generate BUILD.gn file for Android
# run: python3 generate_build_gn_android.py
# working-directory: importer

- name: Update icon sheet
run: python3 generate_icons_md.py
Expand All @@ -266,58 +261,58 @@ jobs:
REMOTE_REPO="https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
git push $REMOTE_REPO HEAD:main --follow-tags --tags
publish-android-demo:
name: Publish Android demo app
runs-on: ubuntu-latest
needs: publish-library

steps:
- uses: actions/checkout@v2

- name: Bump version patch
run: |
grep -E "[0-9]+\.[0-9]+\.[0-9]+" FluentIcons.podspec | python3 -c """
import sys
import os
current_version = sys.stdin.read().strip().split(\"'\")[1]
major, minor, patch = current_version.split('.')
os.system(f'echo \"NEW_VERSION={major}.{minor}.{int(patch) + 1}\" >> \$GITHUB_ENV')
"""
- name: Use Node 11
uses: actions/setup-node@v1
with:
node-version: 11.x

- run: npm install
working-directory: importer

- name: Run generate script
run: npm run deploy:android
working-directory: importer

- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: 8

- name: Restore release keystore
run: |
echo "${{ secrets.ANDROID_KEYSTORE }}" > release.keystore.asc
gpg -d --passphrase "${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" --batch release.keystore.asc > release.keystore
- name: Build Android demo app
uses: eskatos/gradle-command-action@v1
with:
arguments: ':sample-showcase:assembleRelease -DversionName=${{ env.NEW_VERSION }} -DversionCode=${{ github.run_number }} -Pandroid.injected.signing.store.file=/home/runner/work/fluentui-system-icons/fluentui-system-icons/release.keystore -Pandroid.injected.signing.store.password=${{ secrets.ANDROID_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.ANDROID_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}'
build-root-directory: android
wrapper-directory: android

- name: Publish apk to App Center
uses: wzieba/[email protected]
with:
appName: ${{ secrets.APP_CENTER_DEMO_APP_NAME }}
token: ${{ secrets.APP_CENTER_TOKEN }}
group: Public
file: android/sample-showcase/build/outputs/apk/release/sample-showcase-release.apk
releaseNotes: Please enjoy this latest version(${{ env.NEW_VERSION }}) of Fluent System Icons Demo.
# publish-android-demo:
# name: Publish Android demo app
# runs-on: ubuntu-latest
# needs: publish-library

# steps:
# - uses: actions/checkout@v2

# - name: Bump version patch
# run: |
# grep -E "[0-9]+\.[0-9]+\.[0-9]+" FluentIcons.podspec | python3 -c """
# import sys
# import os
# current_version = sys.stdin.read().strip().split(\"'\")[1]
# major, minor, patch = current_version.split('.')
# os.system(f'echo \"NEW_VERSION={major}.{minor}.{int(patch) + 1}\" >> \$GITHUB_ENV')
# """

# - name: Use Node 11
# uses: actions/setup-node@v1
# with:
# node-version: 11.x

# - run: npm install
# working-directory: importer

# - name: Run generate script
# run: npm run deploy:android
# working-directory: importer

# - name: Setup Java
# uses: actions/setup-java@v1
# with:
# java-version: 8

# - name: Restore release keystore
# run: |
# echo "${{ secrets.ANDROID_KEYSTORE }}" > release.keystore.asc
# gpg -d --passphrase "${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" --batch release.keystore.asc > release.keystore

# - name: Build Android demo app
# uses: eskatos/gradle-command-action@v1
# with:
# arguments: ':sample-showcase:assembleRelease -DversionName=${{ env.NEW_VERSION }} -DversionCode=${{ github.run_number }} -Pandroid.injected.signing.store.file=/home/runner/work/fluentui-system-icons/fluentui-system-icons/release.keystore -Pandroid.injected.signing.store.password=${{ secrets.ANDROID_KEYSTORE_PASSWORD }} -Pandroid.injected.signing.key.alias=${{ secrets.ANDROID_KEYSTORE_ALIAS }} -Pandroid.injected.signing.key.password=${{ secrets.ANDROID_KEYSTORE_PASSWORD }}'
# build-root-directory: android
# wrapper-directory: android

# - name: Publish apk to App Center
# uses: wzieba/[email protected]
# with:
# appName: ${{ secrets.APP_CENTER_DEMO_APP_NAME }}
# token: ${{ secrets.APP_CENTER_TOKEN }}
# group: Public
# file: android/sample-showcase/build/outputs/apk/release/sample-showcase-release.apk
# releaseNotes: Please enjoy this latest version(${{ env.NEW_VERSION }}) of Fluent System Icons Demo.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ repositories {
Include the following dependency in your project's `build.gradle`:

```groovy
implementation 'com.microsoft.design:fluent-system-icons:1.1.230@aar'
implementation 'com.microsoft.design:fluent-system-icons:1.1.258@aar'
```

For library docs, see [android/README.md](android/README.md).
Expand All @@ -48,13 +48,13 @@ For library docs, see [android/README.md](android/README.md).
```ruby
use_frameworks!

pod "FluentIcons", "1.1.230"
pod "FluentIcons", "1.1.258"
```

#### Carthage

```bash
git "[email protected]:microsoft/fluentui-system-icons.git" "1.1.230"
git "[email protected]:microsoft/fluentui-system-icons.git" "1.1.258"
```

For library docs, see [ios/README.md](ios/README.md).
Expand All @@ -66,7 +66,7 @@ In the `pubspec.yaml` of your flutter project, add the following dependency:
```yaml
dependencies:
...
fluentui_system_icons: ^1.1.230
fluentui_system_icons: ^1.1.258
```
For library docs, see [flutter/README.md](flutter/README.md).
Expand Down
Loading

0 comments on commit 6b5644a

Please sign in to comment.