diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml index 3f5d98b23..6b841138e 100644 --- a/.github/workflows/ios_android.yml +++ b/.github/workflows/ios_android.yml @@ -6,6 +6,9 @@ on: react-native-version: required: true type: string + release-version: + required: true + type: string jobs: Build: @@ -31,7 +34,7 @@ jobs: run: npm install working-directory: ./Package - name: Gulp - run: npx gulp --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ github.event.release.name }} + run: npx gulp --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }} working-directory: ./Package - name: Upload Assembled iOS Android Folder uses: actions/upload-artifact@v2 diff --git a/.github/workflows/ios_android_tag.yml b/.github/workflows/ios_android_tag.yml deleted file mode 100644 index 6b841138e..000000000 --- a/.github/workflows/ios_android_tag.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: 'build ios-android' - -on: - workflow_call: - inputs: - react-native-version: - required: true - type: string - release-version: - required: true - type: string - -jobs: - Build: - runs-on: macos-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'recursive' - - name: Setup CMake - uses: jwlawson/actions-setup-cmake@v1.8 - with: - cmake-version: '3.19.6' # See https://gitlab.kitware.com/cmake/cmake/-/issues/22021 - - name: Setup Ninja - run: brew install ninja - - name: NPM Install (Playground) - run: npm install - working-directory: ./Apps/Playground - - name: Select React Native Version ${{ inputs.react-native-version }} - run: npm run select --reactNative ${{ inputs.react-native-version }} - working-directory: ./Apps/Playground - - name: NPM Install (Binary Package) - run: npm install - working-directory: ./Package - - name: Gulp - run: npx gulp --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }} - working-directory: ./Package - - name: Upload Assembled iOS Android Folder - uses: actions/upload-artifact@v2 - with: - name: 'Assembled-iOSAndroid${{ inputs.react-native-version }}' - path: Package/Assembled-iOSAndroid \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 203a3135d..f42ce67d1 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,24 +8,30 @@ jobs: uses: ./.github/workflows/ios_android.yml with: react-native-version: 0.64 + release-version: ${GITHUB_REF/refs\/tags\//} build-android-ios-065: uses: ./.github/workflows/ios_android.yml with: react-native-version: 0.65 + release-version: ${GITHUB_REF/refs\/tags\//} build-windows-064: uses: ./.github/workflows/windows.yml with: react-native-version: 0.64 + release-version: ${GITHUB_REF/refs\/tags\//} build-windows-065: uses: ./.github/workflows/windows.yml with: react-native-version: 0.65 + release-version: ${GITHUB_REF/refs\/tags\//} build-typescript: uses: ./.github/workflows/typescript.yml + with: + release-version: ${GITHUB_REF/refs\/tags\//} package: needs: [build-typescript, build-android-ios-064, build-android-ios-065, build-windows-064, build-windows-065] @@ -103,6 +109,6 @@ jobs: run: | npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//} npm publish --access public - working-directory: ./Package/Assembled-Windows0.64 + working-directory: ./Package/Assembled-Windows0.65 env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/publish_preview.yml b/.github/workflows/publish_preview.yml index 86966f6cc..c545109d8 100644 --- a/.github/workflows/publish_preview.yml +++ b/.github/workflows/publish_preview.yml @@ -6,7 +6,7 @@ on: description: 'NPM Release Version' required: true type: string - default: 0.0.1 + default: 1.0.0 NPM_tag: description: 'NPM Tag' required: true @@ -15,31 +15,31 @@ on: jobs: build-android-ios-064: - uses: ./.github/workflows/ios_android_tag.yml + uses: ./.github/workflows/ios_android.yml with: react-native-version: 0.64 release-version: ${{ github.event.inputs.release_version }} build-android-ios-065: - uses: ./.github/workflows/ios_android_tag.yml + uses: ./.github/workflows/ios_android.yml with: react-native-version: 0.65 release-version: ${{ github.event.inputs.release_version }} build-windows-064: - uses: ./.github/workflows/windows_tag.yml + uses: ./.github/workflows/windows.yml with: react-native-version: 0.64 release-version: ${{ github.event.inputs.release_version }} build-windows-065: - uses: ./.github/workflows/windows_tag.yml + uses: ./.github/workflows/windows.yml with: react-native-version: 0.65 release-version: ${{ github.event.inputs.release_version }} build-typescript: - uses: ./.github/workflows/typescript_tag.yml + uses: ./.github/workflows/typescript.yml with: release-version: ${{ github.event.inputs.release_version }} diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml index 5d5fd5790..73929ec33 100644 --- a/.github/workflows/typescript.yml +++ b/.github/workflows/typescript.yml @@ -1,7 +1,11 @@ name: 'build Typescript' -on: [workflow_call] - +on: + workflow_call: + inputs: + release-version: + required: true + type: string jobs: Build: runs-on: macos-latest @@ -20,7 +24,7 @@ jobs: run: npm install working-directory: ./Package - name: Gulp - run: npx gulp buildTS --releaseVersion ${{ github.event.release.name }} + run: npx gulp buildTS --releaseVersion ${{ inputs.release-version }} working-directory: ./Package - name: Upload Assembled Folder uses: actions/upload-artifact@v2 diff --git a/.github/workflows/typescript_tag.yml b/.github/workflows/typescript_tag.yml deleted file mode 100644 index 73929ec33..000000000 --- a/.github/workflows/typescript_tag.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: 'build Typescript' - -on: - workflow_call: - inputs: - release-version: - required: true - type: string -jobs: - Build: - runs-on: macos-latest - steps: - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'recursive' - - name: NPM Install (Playground) - run: npm install - working-directory: ./Apps/Playground - - name: Select React Native Version - run: npm run select 0.64 - working-directory: ./Apps/Playground - - name: NPM Install (Binary Package) - run: npm install - working-directory: ./Package - - name: Gulp - run: npx gulp buildTS --releaseVersion ${{ inputs.release-version }} - working-directory: ./Package - - name: Upload Assembled Folder - uses: actions/upload-artifact@v2 - with: - name: 'Assembled' - path: Package/Assembled diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 02e8120e5..51b20b268 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,6 +6,9 @@ on: react-native-version: required: true type: string + release-version: + required: true + type: string jobs: Build: @@ -31,7 +34,7 @@ jobs: run: npm install working-directory: ./Package - name: Git (Windows) - run: npx gulp initializeSubmodulesWindowsAgent --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ github.event.release.name }} + run: npx gulp initializeSubmodulesWindowsAgent --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }} working-directory: ./Package - name: Gulp (Windows) run: npx gulp buildUWPPublish diff --git a/.github/workflows/windows_tag.yml b/.github/workflows/windows_tag.yml deleted file mode 100644 index 51b20b268..000000000 --- a/.github/workflows/windows_tag.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: 'build windows' - -on: - workflow_call: - inputs: - react-native-version: - required: true - type: string - release-version: - required: true - type: string - -jobs: - Build: - runs-on: windows-2019 - steps: - - name: Checkout Repo - uses: actions/checkout@v2.3.3 - with: - submodules: 'true' - - name: Setup MSBuild - uses: microsoft/setup-msbuild@v1.0.2 - - name: Setup NuGet - uses: nuget/setup-nuget@v1 - with: - nuget-version: '5.x' - - name: NPM Install (Playground) - run: npm install - working-directory: ./Apps/Playground - - name: NPM Install (React Native ${{ inputs.react-native-version }}) - run: npm run select --reactNative ${{ inputs.react-native-version }} - working-directory: ./Apps/Playground - - name: NPM Install (Binary Package) - run: npm install - working-directory: ./Package - - name: Git (Windows) - run: npx gulp initializeSubmodulesWindowsAgent --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }} - working-directory: ./Package - - name: Gulp (Windows) - run: npx gulp buildUWPPublish - working-directory: ./Package - - name: Upload Assembled-Windows Folder - uses: actions/upload-artifact@v2 - with: - name: 'Assembled-Windows${{ inputs.react-native-version }}' - path: Package/Assembled-Windows \ No newline at end of file