Skip to content

Commit

Permalink
Merge branch 'feat/remove-dead-code-WPB-8605' of github.com:wireapp/w…
Browse files Browse the repository at this point in the history
…ire-ios into feat/remove-dead-code-WPB-8605
  • Loading branch information
netbe committed Dec 12, 2024
2 parents a8c56d2 + c6dd866 commit ab2f9ab
Show file tree
Hide file tree
Showing 1,117 changed files with 20,464 additions and 27,948 deletions.
1 change: 0 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ _Optional: add details about technical approach, solutions etc._

_Optional: reference dependencies to other pull requests etc._


### Testing

_Describe how to test._
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/_reusable_app_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
is_cloud_build:
type: boolean
default: true
countly_enabled:
type: boolean
datadog_enabled:
type: boolean
default: false
Expand Down Expand Up @@ -91,7 +93,7 @@ jobs:
WIRE_INTERNAL_GITHUB_USER: ${{ secrets.WIRE_INTERNAL_GITHUB_USER }}
WIRE_INTERNAL_GITHUB_TOKEN: ${{ secrets.WIRE_INTERNAL_GITHUB_TOKEN }}
APPCENTER_API_TOKEN: ${{ secrets.APPCENTER_API_TOKEN }}
APPCENTER_OWNER_NAME: ${{ secrets.APPCENTER_OWNER_NAME }}
APPCENTER_OWNER_NAME: "Wire"
S3_BUCKET: "z-lohika"
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -115,6 +117,7 @@ jobs:
PLAYGROUND_TESTFLIGHT_LINK: ${{ secrets.PLAYGROUND_TESTFLIGHT_LINK }}
COUNTLY_PRODUCTION_KEY: ${{ secrets.COUNTLY_PRODUCTION_KEY }}
COUNTLY_INTERNAL_KEY: ${{ secrets.COUNTLY_INTERNAL_KEY }}
ENABLE_COUNTLY: ${{ inputs.countly_enabled }}
SLACK_WEBHOOK_URL: ${{ secrets.WIRE_IOS_CI_WEBHOOK }}
SKIP_SECURITY_TESTS: ${{ inputs.skip_security_tests }}
SEND_TO_EXTERNALS: ${{ inputs.distribute_externals }}
Expand Down Expand Up @@ -159,7 +162,7 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ env.PACKAGES_DIR }}
key: ${{ runner.os }}-swiftpm-project-${{ hashFiles('**/*.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}-${{ env.ENABLE_DATADOG }}
key: ${{ runner.os }}-swiftpm-project-${{ hashFiles('**/*.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}-${{ env.ENABLE_COUNTLY }}-${{ env.ENABLE_DATADOG }}

# Resolve Swift Package Dependencies
- name: Resolve Swift Package Dependencies
Expand All @@ -186,7 +189,7 @@ jobs:
uses: actions/upload-artifact@v4
if: failure()
with:
name: build-logs
name: build-logs (${{ github.run_id }} - ${{ github.run_attempt}})
path: |
/Users/runner/Library/Developer/Xcode/DerivedData/**/Logs/**
~/Library/Logs/DiagnosticReports/**
Expand All @@ -196,7 +199,7 @@ jobs:
if: always()
uses: actions/upload-artifact@v4
with:
name: post-build-env-${{ inputs.fastlane_action }}
name: post-build-env-${{ inputs.fastlane_action }} (${{ github.run_id }} - ${{ github.run_attempt}})
path: |
**/.post_build/*.env
- name: Load .env file
Expand All @@ -213,7 +216,7 @@ jobs:
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
text: "**${{ env.APP_NAME }}** (version: ${{ env.BUILD_VERSION }} build: ${{ env.BUILD_NUMBER }}) is ready to test 🚀\n**DATADOG_ENABLED:** ${{ env.ENABLE_DATADOG }}\n**CHANGELOG:** ${{ needs.changelog.outputs.changelog-url }}\n**Tap on iOS device to install:** ${{ env.BUILD_INSTALL_LINK }}\n**AWS S3 Paths:**\n`${{ steps.base64-decoded-S3_PATHS.outputs.decoded }}`\n**Triggered by:** ${{ github.triggering_actor }}\n**Build log:** ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\n"
text: "**${{ env.APP_NAME }}** (version: ${{ env.BUILD_VERSION }} build: ${{ env.BUILD_NUMBER }}) is ready to test 🚀\n**COUNTLY_ENABLED:** ${{ env.ENABLE_COUNTLY }}\n**DATADOG_ENABLED:** ${{ env.ENABLE_DATADOG }}\n**CHANGELOG:** ${{ needs.changelog.outputs.changelog-url }}\n**Tap on iOS device to install:** ${{ env.BUILD_INSTALL_LINK }}\n**AWS S3 Paths:**\n`${{ steps.base64-decoded-S3_PATHS.outputs.decoded }}`\n**Triggered by:** ${{ github.triggering_actor }}\n**Build log:** ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}\n"
- name: Notify on Wire if failed
if: failure()
uses: 8398a7/action-slack@v3
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/_reusable_app_release_without_changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
is_cloud_build:
type: boolean
default: true
countly_enabled:
type: boolean
datadog_enabled:
type: boolean
default: false
Expand Down Expand Up @@ -89,7 +91,7 @@ jobs:
WIRE_INTERNAL_GITHUB_USER: ${{ secrets.WIRE_INTERNAL_GITHUB_USER }}
WIRE_INTERNAL_GITHUB_TOKEN: ${{ secrets.WIRE_INTERNAL_GITHUB_TOKEN }}
APPCENTER_API_TOKEN: ${{ secrets.APPCENTER_API_TOKEN }}
APPCENTER_OWNER_NAME: ${{ secrets.APPCENTER_OWNER_NAME }}
APPCENTER_OWNER_NAME: "Wire"
S3_BUCKET: "z-lohika"
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
Expand All @@ -113,6 +115,7 @@ jobs:
PLAYGROUND_TESTFLIGHT_LINK: ${{ secrets.PLAYGROUND_TESTFLIGHT_LINK }}
COUNTLY_PRODUCTION_KEY: ${{ secrets.COUNTLY_PRODUCTION_KEY }}
COUNTLY_INTERNAL_KEY: ${{ secrets.COUNTLY_INTERNAL_KEY }}
ENABLE_COUNTLY: ${{ inputs.countly_enabled }}
SLACK_WEBHOOK_URL: ${{ secrets.WIRE_IOS_CI_WEBHOOK }}
SKIP_SECURITY_TESTS: ${{ inputs.skip_security_tests }}
SEND_TO_EXTERNALS: ${{ inputs.distribute_externals }}
Expand Down Expand Up @@ -150,7 +153,7 @@ jobs:
uses: actions/cache@v3
with:
path: ${{ env.PACKAGES_DIR }}
key: ${{ runner.os }}-swiftpm-project-${{ hashFiles('**/*.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}-${{ env.ENABLE_DATADOG }}
key: ${{ runner.os }}-swiftpm-project-${{ hashFiles('**/*.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}-${{ env.ENABLE_COUNTLY }}-${{ env.ENABLE_DATADOG }}
- name: Resolve Swift Package Dependencies
run: |
( cd $REPO_ROOT && xcodebuild -resolvePackageDependencies -disableAutomaticPackageResolution -clonedSourcePackagesDirPath "$PACKAGES_DIR" )
Expand Down
Loading

0 comments on commit ab2f9ab

Please sign in to comment.