re-eabled other framework build

elastic · Jun 3, 2024 · f977095 · f977095
1 parent b6f3bb8
commit f977095
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 55 deletions.
diff --git a/.ci/scripts/package.sh b/.ci/scripts/package.sh
@@ -11,7 +11,7 @@ readonly RELATIVE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1
 readonly BASE_PROJECT="$(dirname $(dirname "${RELATIVE_DIR}"))"
 
 # Extract application version
-APP_VERSION="$(sed -n 's/public static let ELASTIC_SWIFT_AGENT_VERSION : String = \"\(.*\)\"/\1/p' ./Sources/apm-agent-ios/Version.swift | sed -e 's/^[[:space:]]*//')"
+APP_VERSION="$(sed -n 's/public static let elasticSwiftAgentVersion : String = \"\(.*\)\"/\1/p' ./Sources/apm-agent-ios/Version.swift | sed -e 's/^[[:space:]]*//')"
 
 # Create a dist folder
 rm -rf "${BASE_PROJECT}/dist"

diff --git a/.ci/scripts/xcframework.sh b/.ci/scripts/xcframework.sh
diff --git a/.github/workflows/xcframework.yml b/.github/workflows/xcframework.yml
@@ -65,29 +65,46 @@ jobs:
                         -framework $(pwd)/build/Release-tvOS.xcarchive/Products/Library/Frameworks/ElasticApm.framework \
                         -output ./package/ElasticApm_tvOS.xcframework
             - name: Package frameworks
+              id: package-frameworks
               run: |
-                APP_VERSION="$(sed -n 's/public static let ELASTIC_SWIFT_AGENT_VERSION : String = \"\(.*\)\"/\1/p' ./Sources/apm-agent-ios/Version.swift | sed -e 's/^[[:space:]]*//')"
+                av=`sed -n -E "s/public static let elasticSwiftAgentVersion: String = \"(.*)\"/\1/p" Sources/apm-agent-ios/Version.swift  | sed -e 's/^[[:space:]]*//'`
+                echo "using version ${av}"
+                echo "APP_VERSION=${av}" >> "$GITHUB_ENV"
                 rm -rf "./dist"
                 mkdir -p "./dist"
                 echo $(pwd)
-                tar -czf "./dist/ElasticApm_tvOS-${APP_VERSION}.tar.gz" -C ./package ElasticApm_tvOS.xcframework
+                tar -czf "./dist/ElasticApm_tvOS-${av}.tar.gz" -C ./package ElasticApm_tvOS.xcframework
+                ls ./dist
 #                tar -czf "./dist/ElasticApm_macOS-${APP_VERSION}.tar.gz" -C ./package ElasticApm_macOS.xcframework
 #                tar -czf "./dist/ElasticApm_iOS-${APP_VERSION}.tar.gz" -C ./package ElasticApm_iOS.xcframework
             - name: Generate tvOS Framework provenance
               uses: actions/attest-build-provenance@173725a1209d09b31f9d30a3890cf2757ebbff0d  # v1.1.2
               with:
-                subject-path: "${{ github.workspace }}/dist/ElasticApm_tvOS-*.tar.gz"
+                subject-path: "./dist/ElasticApm_tvOS-${{ APP_VERSION }}.tar.gz"
 #            - name: Generate iOS Framework provenance
 #              uses: actions/attest-build-provenance@173725a1209d09b31f9d30a3890cf2757ebbff0d  # v1.1.2
+#              env:
+#                APP_VERSION: ${{ steps.package-frameworks.outputs.APP_VERSION }}
 #              with:
 #                subject-path: "${{ github.workspace }}/build/ElasticApm_iOS-${APP_VERSION}.tar.gz"
 #            - name: Generate macOS Framework provenance
 #              uses: actions/attest-build-provenance@173725a1209d09b31f9d30a3890cf2757ebbff0d  # v1.1.2
+#              env:
+#                APP_VERSION: ${{ steps.package-frameworks.outputs.APP_VERSION }}
 #              with:
 #                subject-path: "${{ github.workspace }}/build/ElasticApm_macOS-${APP_VERSION}.tar.gz"
             - uses: actions/upload-artifact@v4
               with:
-                name: snapshoty
+                name: ElasticAPM_macOS-${APP_VERSION}.tar.gz
                 path: |
-                    .ci/snapshoty.yml
-                    dist/**
+                    dist/ElasticAPM_macOS-${APP_VERSION}.tar.gz
+            - uses: actions/upload-artifact@v4
+              with:
+                name: ElasticAPM_tvOS-${APP_VERSION}.tar.gz
+                path: |
+                    dist/ElasticAPM_tvOS-${APP_VERSION}.tar.gz
+            - uses: actions/upload-artifact@v4
+              with:
+                name: ElasticAPM_iOS-${APP_VERSION}.tar.gz
+                path: |
+                    dist/ElasticAPM_iOS-${APP_VERSION}.tar.gz