mirror of
https://github.com/oxen-io/session-android.git
synced 2024-11-23 18:15:22 +00:00
Merge branch 'dev' into on
This commit is contained in:
Andrew
commit
0ca55c8f42
88
.drone.jsonnet
Normal file
88
.drone.jsonnet
Normal file
@ -0,0 +1,88 @@
|
||||
local docker_base = 'registry.oxen.rocks/lokinet-ci-';
|
||||
|
||||
// Log a bunch of version information to make it easier for debugging
|
||||
local version_info = {
|
||||
name: 'Version Information',
|
||||
image: docker_base + 'android',
|
||||
commands: [
|
||||
'cmake --version',
|
||||
'apt --installed list'
|
||||
]
|
||||
};
|
||||
|
||||
|
||||
// Intentionally doing a depth of 2 as libSession-util has it's own submodules (and libLokinet likely will as well)
|
||||
local clone_submodules = {
|
||||
name: 'Clone Submodules',
|
||||
image: 'drone/git',
|
||||
commands: ['git fetch --tags', 'git submodule update --init --recursive --depth=2 --jobs=4']
|
||||
};
|
||||
|
||||
// cmake options for static deps mirror
|
||||
local ci_dep_mirror(want_mirror) = (if want_mirror then ' -DLOCAL_MIRROR=https://oxen.rocks/deps ' else '');
|
||||
|
||||
[
|
||||
// Unit tests (PRs only)
|
||||
{
|
||||
kind: 'pipeline',
|
||||
type: 'docker',
|
||||
name: 'Unit Tests',
|
||||
platform: { arch: 'amd64' },
|
||||
trigger: { event: { exclude: [ 'push' ] } },
|
||||
steps: [
|
||||
version_info,
|
||||
clone_submodules,
|
||||
{
|
||||
name: 'Run Unit Tests',
|
||||
image: docker_base + 'android',
|
||||
pull: 'always',
|
||||
environment: { ANDROID_HOME: '/usr/lib/android-sdk' },
|
||||
commands: [
|
||||
'apt-get install -y ninja-build',
|
||||
'./gradlew testPlayDebugUnitTestCoverageReport'
|
||||
],
|
||||
}
|
||||
],
|
||||
},
|
||||
// Validate build artifact was created by the direct branch push (PRs only)
|
||||
{
|
||||
kind: 'pipeline',
|
||||
type: 'docker',
|
||||
name: 'Check Build Artifact Existence',
|
||||
platform: { arch: 'amd64' },
|
||||
trigger: { event: { exclude: [ 'push' ] } },
|
||||
steps: [
|
||||
{
|
||||
name: 'Poll for build artifact existence',
|
||||
image: docker_base + 'android',
|
||||
pull: 'always',
|
||||
commands: [
|
||||
'./scripts/drone-upload-exists.sh'
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
// Debug APK build (non-PRs only)
|
||||
{
|
||||
kind: 'pipeline',
|
||||
type: 'docker',
|
||||
name: 'Debug APK Build',
|
||||
platform: { arch: 'amd64' },
|
||||
trigger: { event: { exclude: [ 'pull_request' ] } },
|
||||
steps: [
|
||||
version_info,
|
||||
clone_submodules,
|
||||
{
|
||||
name: 'Build and upload',
|
||||
image: docker_base + 'android',
|
||||
pull: 'always',
|
||||
environment: { SSH_KEY: { from_secret: 'SSH_KEY' }, ANDROID_HOME: '/usr/lib/android-sdk' },
|
||||
commands: [
|
||||
'apt-get install -y ninja-build',
|
||||
'./gradlew assemblePlayDebug',
|
||||
'./scripts/drone-static-upload.sh'
|
||||
],
|
||||
}
|
||||
],
|
||||
}
|
||||
]
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@ -16,4 +16,7 @@ ffpr
|
||||
*.sh
|
||||
pkcs11.password
|
||||
app/play
|
||||
app/huawei
|
||||
app/huawei
|
||||
|
||||
!/scripts/drone-static-upload.sh
|
||||
!/scripts/drone-upload-exists.sh
|
||||
@ -31,8 +31,8 @@ configurations.all {
|
||||
exclude module: "commons-logging"
|
||||
}
|
||||
|
||||
def canonicalVersionCode = 359
|
||||
def canonicalVersionName = "1.17.4"
|
||||
def canonicalVersionCode = 360
|
||||
def canonicalVersionName = "1.17.5"
|
||||
|
||||
def postFixSize = 10
|
||||
def abiPostFix = ['armeabi-v7a' : 1,
|
||||
@ -124,6 +124,7 @@ android {
|
||||
debug {
|
||||
isDefault true
|
||||
minifyEnabled false
|
||||
enableUnitTestCoverage true
|
||||
}
|
||||
}
|
||||
|
||||
@ -201,6 +202,27 @@ android {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
task testPlayDebugUnitTestCoverageReport(type: JacocoReport, dependsOn: "testPlayDebugUnitTest") {
|
||||
reports {
|
||||
xml.enabled = true
|
||||
}
|
||||
|
||||
// Add files that should not be listed in the report (e.g. generated Files from dagger)
|
||||
def fileFilter = []
|
||||
def mainSrc = "$projectDir/src/main/java"
|
||||
def kotlinDebugTree = fileTree(dir: "${buildDir}/tmp/kotlin-classes/playDebug", excludes: fileFilter)
|
||||
|
||||
// Compiled Kotlin class files are written into build-variant-specific subdirectories of 'build/tmp/kotlin-classes'.
|
||||
classDirectories.from = files([kotlinDebugTree])
|
||||
|
||||
// To produce an accurate report, the bytecode is mapped back to the original source code.
|
||||
sourceDirectories.from = files([mainSrc])
|
||||
|
||||
// Execution data generated when running the tests against classes instrumented by the JaCoCo agent.
|
||||
// This is enabled with 'enableUnitTestCoverage' in the 'debug' build type.
|
||||
executionData.from = "${project.buildDir}/outputs/unit_test_code_coverage/playDebugUnitTest/testPlayDebugUnitTest.exec"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
@ -1946,6 +1946,14 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
|
||||
|
||||
override fun saveAttachment(messages: Set<MessageRecord>) {
|
||||
val message = messages.first() as MmsMessageRecord
|
||||
|
||||
// Do not allow the user to download a file attachment before it has finished downloading
|
||||
// TODO: Localise the msg in this toast!
|
||||
if (message.isMediaPending) {
|
||||
Toast.makeText(this, resources.getString(R.string.conversation_activity__wait_until_attachment_has_finished_downloading), Toast.LENGTH_LONG).show()
|
||||
return
|
||||
}
|
||||
|
||||
SaveAttachmentTask.showWarningDialog(this) {
|
||||
Permissions.with(this)
|
||||
.request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
|
||||
|
||||
@ -37,6 +37,7 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
|
||||
private val vMargin by lazy { toDp(4, resources) }
|
||||
private val minHeight by lazy { toPx(56, resources) }
|
||||
private var linkPreviewDraftView: LinkPreviewDraftView? = null
|
||||
private var quoteView: QuoteView? = null
|
||||
var delegate: InputBarDelegate? = null
|
||||
var additionalContentHeight = 0
|
||||
var quote: MessageRecord? = null
|
||||
@ -98,7 +99,7 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
|
||||
binding.inputBarEditText.imeOptions = EditorInfo.IME_ACTION_NONE
|
||||
binding.inputBarEditText.inputType =
|
||||
binding.inputBarEditText.inputType or
|
||||
InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
|
||||
InputType.TYPE_TEXT_FLAG_CAP_SENTENCES
|
||||
}
|
||||
val incognitoFlag = if (TextSecurePreferences.isIncognitoKeyboardEnabled(context)) 16777216 else 0
|
||||
binding.inputBarEditText.imeOptions = binding.inputBarEditText.imeOptions or incognitoFlag // Always use incognito keyboard if setting enabled
|
||||
@ -138,53 +139,64 @@ class InputBar : RelativeLayout, InputBarEditTextDelegate, QuoteViewDelegate, Li
|
||||
delegate?.startRecordingVoiceMessage()
|
||||
}
|
||||
|
||||
// Drafting quotes and drafting link previews is mutually exclusive, i.e. you can't draft
|
||||
// a quote and a link preview at the same time.
|
||||
|
||||
fun draftQuote(thread: Recipient, message: MessageRecord, glide: GlideRequests) {
|
||||
quote = message
|
||||
linkPreview = null
|
||||
linkPreviewDraftView = null
|
||||
binding.inputBarAdditionalContentContainer.removeAllViews()
|
||||
|
||||
// inflate quoteview with typed array here
|
||||
// If we already have a link preview View then clear the 'additional content' layout so that
|
||||
// our quote View is always the first element (i.e., at the top of the reply).
|
||||
if (linkPreview != null && linkPreviewDraftView != null) {
|
||||
binding.inputBarAdditionalContentContainer.removeAllViews()
|
||||
}
|
||||
|
||||
// Inflate quote View with typed array here
|
||||
val layout = LayoutInflater.from(context).inflate(R.layout.view_quote_draft, binding.inputBarAdditionalContentContainer, false)
|
||||
val quoteView = layout.findViewById<QuoteView>(R.id.mainQuoteViewContainer)
|
||||
quoteView.delegate = this
|
||||
binding.inputBarAdditionalContentContainer.addView(layout)
|
||||
val attachments = (message as? MmsMessageRecord)?.slideDeck
|
||||
val sender = if (message.isOutgoing) TextSecurePreferences.getLocalNumber(context)!! else message.individualRecipient.address.serialize()
|
||||
quoteView.bind(sender, message.body, attachments,
|
||||
thread, true, message.isOpenGroupInvitation, message.threadId, false, glide)
|
||||
quoteView = layout.findViewById<QuoteView>(R.id.mainQuoteViewContainer).also {
|
||||
it.delegate = this
|
||||
binding.inputBarAdditionalContentContainer.addView(layout)
|
||||
val attachments = (message as? MmsMessageRecord)?.slideDeck
|
||||
val sender = if (message.isOutgoing) TextSecurePreferences.getLocalNumber(context)!! else message.individualRecipient.address.serialize()
|
||||
it.bind(sender, message.body, attachments, thread, true, message.isOpenGroupInvitation, message.threadId, false, glide)
|
||||
}
|
||||
|
||||
// Before we request a layout update we'll add back any LinkPreviewDraftView that might
|
||||
// exist - as this goes into the LinearLayout second it will be below the quote View.
|
||||
if (linkPreview != null && linkPreviewDraftView != null) {
|
||||
binding.inputBarAdditionalContentContainer.addView(linkPreviewDraftView)
|
||||
}
|
||||
requestLayout()
|
||||
}
|
||||
|
||||
override fun cancelQuoteDraft() {
|
||||
binding.inputBarAdditionalContentContainer.removeView(quoteView)
|
||||
quote = null
|
||||
binding.inputBarAdditionalContentContainer.removeAllViews()
|
||||
quoteView = null
|
||||
requestLayout()
|
||||
}
|
||||
|
||||
fun draftLinkPreview() {
|
||||
quote = null
|
||||
binding.inputBarAdditionalContentContainer.removeAllViews()
|
||||
val linkPreviewDraftView = LinkPreviewDraftView(context)
|
||||
linkPreviewDraftView.delegate = this
|
||||
this.linkPreviewDraftView = linkPreviewDraftView
|
||||
// As `draftLinkPreview` is called before `updateLinkPreview` when we modify a URI in a
|
||||
// message we'll bail early if a link preview View already exists and just let
|
||||
// `updateLinkPreview` get called to update the existing View.
|
||||
if (linkPreview != null && linkPreviewDraftView != null) return
|
||||
|
||||
linkPreviewDraftView = LinkPreviewDraftView(context).also { it.delegate = this }
|
||||
|
||||
// Add the link preview View. Note: If there's already a quote View in the 'additional
|
||||
// content' container then this preview View will be added after / below it - which is fine.
|
||||
binding.inputBarAdditionalContentContainer.addView(linkPreviewDraftView)
|
||||
requestLayout()
|
||||
}
|
||||
|
||||
fun updateLinkPreviewDraft(glide: GlideRequests, linkPreview: LinkPreview) {
|
||||
this.linkPreview = linkPreview
|
||||
val linkPreviewDraftView = this.linkPreviewDraftView ?: return
|
||||
linkPreviewDraftView.update(glide, linkPreview)
|
||||
fun updateLinkPreviewDraft(glide: GlideRequests, updatedLinkPreview: LinkPreview) {
|
||||
// Update our `linkPreview` property with the new (provided as an argument to this function)
|
||||
// then update the View from that.
|
||||
linkPreview = updatedLinkPreview.also { linkPreviewDraftView?.update(glide, it) }
|
||||
}
|
||||
|
||||
override fun cancelLinkPreviewDraft() {
|
||||
if (quote != null) { return }
|
||||
binding.inputBarAdditionalContentContainer.removeView(linkPreviewDraftView)
|
||||
linkPreview = null
|
||||
binding.inputBarAdditionalContentContainer.removeAllViews()
|
||||
linkPreviewDraftView = null
|
||||
requestLayout()
|
||||
}
|
||||
|
||||
|
||||
@ -5,11 +5,13 @@ import android.content.res.ColorStateList
|
||||
import android.util.AttributeSet
|
||||
import android.widget.LinearLayout
|
||||
import androidx.annotation.ColorInt
|
||||
import androidx.core.view.isVisible
|
||||
import network.loki.messenger.databinding.ViewDocumentBinding
|
||||
import org.thoughtcrime.securesms.database.model.MmsMessageRecord
|
||||
|
||||
class DocumentView : LinearLayout {
|
||||
private val binding: ViewDocumentBinding by lazy { ViewDocumentBinding.bind(this) }
|
||||
|
||||
// region Lifecycle
|
||||
constructor(context: Context) : super(context)
|
||||
constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
|
||||
@ -22,6 +24,12 @@ class DocumentView : LinearLayout {
|
||||
binding.documentTitleTextView.text = document.fileName.or("Untitled File")
|
||||
binding.documentTitleTextView.setTextColor(textColor)
|
||||
binding.documentViewIconImageView.imageTintList = ColorStateList.valueOf(textColor)
|
||||
|
||||
// Show the progress spinner if the attachment is downloading, otherwise show
|
||||
// the document icon (and always remove the other, whichever one that is)
|
||||
binding.documentViewProgress.isVisible = message.isMediaPending
|
||||
binding.documentViewIconImageView.isVisible = !message.isMediaPending
|
||||
}
|
||||
// endregion
|
||||
|
||||
}
|
||||
@ -318,4 +318,5 @@ class VisibleMessageContentView : ConstraintLayout {
|
||||
}
|
||||
}
|
||||
// endregion
|
||||
|
||||
}
|
||||
|
||||
@ -63,7 +63,6 @@ import kotlin.math.sqrt
|
||||
|
||||
@AndroidEntryPoint
|
||||
class VisibleMessageView : LinearLayout {
|
||||
|
||||
@Inject lateinit var threadDb: ThreadDatabase
|
||||
@Inject lateinit var lokiThreadDb: LokiThreadDatabase
|
||||
@Inject lateinit var lokiApiDb: LokiAPIDatabase
|
||||
@ -138,8 +137,7 @@ class VisibleMessageView : LinearLayout {
|
||||
val isGroupThread = thread.isGroupRecipient
|
||||
val isStartOfMessageCluster = isStartOfMessageCluster(message, previous, isGroupThread)
|
||||
val isEndOfMessageCluster = isEndOfMessageCluster(message, next, isGroupThread)
|
||||
// Show profile picture and sender name if this is a group thread AND
|
||||
// the message is incoming
|
||||
// Show profile picture and sender name if this is a group thread AND the message is incoming
|
||||
binding.moderatorIconImageView.isVisible = false
|
||||
binding.profilePictureView.visibility = when {
|
||||
thread.isGroupRecipient && !message.isOutgoing && isEndOfMessageCluster -> View.VISIBLE
|
||||
|
||||
@ -42,6 +42,13 @@ class LandingActivity : BaseActionBarActivity() {
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
// We always hit this LandingActivity on launch - but if there is a previous instance of
|
||||
// Session then close this activity to resume the last activity from the previous instance.
|
||||
if (!isTaskRoot) { finish(); return }
|
||||
|
||||
val binding = ActivityLandingBinding.inflate(layoutInflater)
|
||||
setContentView(binding.root)
|
||||
setUpActionBarSessionLogo(true)
|
||||
|
||||
ComposeView(this)
|
||||
|
||||
@ -50,7 +50,7 @@ class PeerConnectionWrapper(private val context: Context,
|
||||
|
||||
private fun initPeerConnection() {
|
||||
val random = SecureRandom().asKotlinRandom()
|
||||
val iceServers = listOf("freyr","fenrir","frigg","angus","hereford","holstein", "brahman").shuffled(random).take(2).map { sub ->
|
||||
val iceServers = listOf("freyr","angus","hereford","holstein", "brahman").shuffled(random).take(2).map { sub ->
|
||||
PeerConnection.IceServer.builder("turn:$sub.getsession.org")
|
||||
.setUsername("session202111")
|
||||
.setPassword("053c268164bc7bd7")
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
android:layout_marginTop="@dimen/large_spacing"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="@string/fragment_enter_community_url_edit_text_hint"
|
||||
android:contentDescription="@string/AccessibilityId_community_input_box"
|
||||
android:inputType="textUri"
|
||||
android:maxLines="3"
|
||||
android:paddingTop="0dp"
|
||||
@ -91,6 +92,7 @@
|
||||
<Button
|
||||
android:id="@+id/joinCommunityButton"
|
||||
style="@style/Widget.Session.Button.Common.ProminentOutline"
|
||||
android:contentDescription="@string/AccessibilityId_join_community_button"
|
||||
android:layout_width="196dp"
|
||||
android:layout_height="@dimen/medium_button_height"
|
||||
android:layout_marginVertical="@dimen/large_spacing"
|
||||
|
||||
@ -10,10 +10,17 @@
|
||||
android:gravity="center"
|
||||
android:contentDescription="@string/AccessibilityId_document">
|
||||
|
||||
<com.google.android.material.progressindicator.CircularProgressIndicator
|
||||
android:id="@+id/documentViewProgress"
|
||||
style="@style/Widget.Material3.CircularProgressIndicator.Small"
|
||||
android:indeterminate="true"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/documentViewIconImageView"
|
||||
android:layout_width="24dp"
|
||||
android:layout_height="24dp"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:src="@drawable/ic_document_large_light"
|
||||
app:tint="?android:textColorPrimary" />
|
||||
|
||||
|
||||
@ -12,8 +12,11 @@
|
||||
android:layout_height="1px"
|
||||
android:background="@color/separator" />
|
||||
|
||||
<FrameLayout
|
||||
<!-- Additional content layout is a LinearLayout with a vertical split (i.e., it uses rows) to
|
||||
allow multiple Views to exist, specifically both QuoteDraft and LinkPreviewDraft Views -->
|
||||
<LinearLayout
|
||||
android:id="@+id/inputBarAdditionalContentContainer"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
|
||||
@ -53,6 +53,9 @@
|
||||
<string name="AccessibilityId_new_direct_message">New direct message</string>
|
||||
<string name="AccessibilityId_create_group">Create group</string>
|
||||
<string name="AccessibilityId_join_community">Join community</string>
|
||||
<!-- Join community pop up -->
|
||||
<string name="AccessibilityId_community_input_box">Community input</string>
|
||||
<string name="AccessibilityId_join_community_button">Join community button</string>
|
||||
<!-- Conversation options (three dots menu)-->
|
||||
<string name="AccessibilityId_all_media">All media</string>
|
||||
<string name="AccessibilityId_search">Search</string>
|
||||
@ -85,7 +88,7 @@
|
||||
<string name="AccessibilityId_block_message_request_button">Block message request</string>
|
||||
<string name="AccessibilityId_timer_icon">Timer icon</string>
|
||||
<!-- Configuration messages -->
|
||||
<string name="AccessibilityId_control_message">Configuration message</string>
|
||||
<string name="AccessibilityId_control_message">Control message</string>
|
||||
<string name="AccessibilityId_blocked_banner">Blocked banner</string>
|
||||
<string name="AccessibilityId_blocked_banner_text">Blocked banner text</string>
|
||||
<!--New Session -->
|
||||
@ -114,7 +117,7 @@
|
||||
<string name="AccessibilityId_message_sent_status_pending">Message sent status pending</string>
|
||||
<string name="AccessibilityId_message_sent_status_syncing">Message sent status syncing</string>
|
||||
<string name="AccessibilityId_message_request_config_message">Message request has been accepted</string>
|
||||
<string name="AccessibilityId_message_body">Message Body</string>
|
||||
<string name="AccessibilityId_message_body">Message body</string>
|
||||
<string name="AccessibilityId_voice_message">Voice message</string>
|
||||
<string name="AccessibilityId_document">Document</string>
|
||||
<string name="AccessibilityId_deleted_message">Deleted message</string>
|
||||
@ -463,6 +466,7 @@
|
||||
<string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Record and send audio attachment</string>
|
||||
<string name="conversation_activity__quick_attachment_drawer_lock_record_description">Lock recording of audio attachment</string>
|
||||
<string name="conversation_activity__enable_signal_for_sms">Enable Session for SMS</string>
|
||||
<string name="conversation_activity__wait_until_attachment_has_finished_downloading">Please wait until attachment has finished downloading</string>
|
||||
<!-- conversation_input_panel -->
|
||||
<string name="conversation_input_panel__slide_to_cancel">Slide to cancel</string>
|
||||
<string name="conversation_input_panel__cancel">Cancel</string>
|
||||
|
||||
@ -10,6 +10,7 @@ import org.hamcrest.CoreMatchers.nullValue
|
||||
import org.hamcrest.MatcherAssert.assertThat
|
||||
import org.junit.Before
|
||||
import org.junit.Test
|
||||
import org.mockito.Mockito
|
||||
import org.mockito.Mockito.anyLong
|
||||
import org.mockito.Mockito.anySet
|
||||
import org.mockito.Mockito.verify
|
||||
@ -49,7 +50,8 @@ class ConversationViewModelTest: BaseViewModelTest() {
|
||||
|
||||
viewModel.saveDraft(draft)
|
||||
|
||||
verify(repository).saveDraft(threadId, draft)
|
||||
// The above is an async process to wait 100ms to give it a chance to complete
|
||||
verify(repository, Mockito.timeout(100).times(1)).saveDraft(threadId, draft)
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@ -26,7 +26,7 @@ android {
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
path "src/main/cpp/CMakeLists.txt"
|
||||
version "3.22.1"
|
||||
version "3.22.1+"
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
|
||||
70
scripts/drone-static-upload.sh
Executable file
70
scripts/drone-static-upload.sh
Executable file
@ -0,0 +1,70 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Script used with Drone CI to upload build artifacts (because specifying all this in
|
||||
# .drone.jsonnet is too painful).
|
||||
|
||||
set -o errexit
|
||||
|
||||
if [ -z "$SSH_KEY" ]; then
|
||||
echo -e "\n\n\n\e[31;1mUnable to upload artifact: SSH_KEY not set\e[0m"
|
||||
# Just warn but don't fail, so that this doesn't trigger a build failure for untrusted builds
|
||||
exit 0
|
||||
fi
|
||||
|
||||
echo "$SSH_KEY" >ssh_key
|
||||
|
||||
set -o xtrace # Don't start tracing until *after* we write the ssh key
|
||||
|
||||
chmod 600 ssh_key
|
||||
|
||||
# Define the output paths
|
||||
build_dir="app/build/outputs/apk/play/debug"
|
||||
target_path="${build_dir}/$(ls ${build_dir} | grep -o 'session-[^[:space:]]*-universal.apk')"
|
||||
|
||||
# Validate the paths exist
|
||||
if [ ! -d $build_path ]; then
|
||||
echo -e "\n\n\n\e[31;1mExpected a file to upload, found none\e[0m" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -n "$DRONE_TAG" ]; then
|
||||
# For a tag build use something like `session-android-v1.2.3-universal`
|
||||
base="session-android-$DRONE_TAG-universal"
|
||||
else
|
||||
# Otherwise build a length name from the datetime and commit hash, such as:
|
||||
# session-android-20200522T212342Z-04d7dcc54-universal
|
||||
base="session-android-$(date --date=@$DRONE_BUILD_CREATED +%Y%m%dT%H%M%SZ)-${DRONE_COMMIT:0:9}-universal"
|
||||
fi
|
||||
|
||||
# Copy over the build products
|
||||
mkdir -vp "$base"
|
||||
cp -av $target_path "$base"
|
||||
|
||||
# tar dat shiz up yo
|
||||
archive="$base.tar.xz"
|
||||
tar cJvf "$archive" "$base"
|
||||
|
||||
upload_to="oxen.rocks/${DRONE_REPO// /_}/${DRONE_BRANCH// /_}"
|
||||
|
||||
# sftp doesn't have any equivalent to mkdir -p, so we have to split the above up into a chain of
|
||||
# -mkdir a/, -mkdir a/b/, -mkdir a/b/c/, ... commands. The leading `-` allows the command to fail
|
||||
# without error.
|
||||
upload_dirs=(${upload_to//\// })
|
||||
put_debug=
|
||||
mkdirs=
|
||||
dir_tmp=""
|
||||
for p in "${upload_dirs[@]}"; do
|
||||
dir_tmp="$dir_tmp$p/"
|
||||
mkdirs="$mkdirs
|
||||
-mkdir $dir_tmp"
|
||||
done
|
||||
|
||||
sftp -i ssh_key -b - -o StrictHostKeyChecking=off drone@oxen.rocks <<SFTP
|
||||
$mkdirs
|
||||
put $archive $upload_to
|
||||
$put_debug
|
||||
SFTP
|
||||
|
||||
set +o xtrace
|
||||
|
||||
echo -e "\n\n\n\n\e[32;1mUploaded to https://${upload_to}/${archive}\e[0m\n\n\n"
|
||||
56
scripts/drone-upload-exists.sh
Executable file
56
scripts/drone-upload-exists.sh
Executable file
@ -0,0 +1,56 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Script used with Drone CI to check for the existence of a build artifact.
|
||||
|
||||
if [[ -z ${DRONE_REPO} || -z ${DRONE_PULL_REQUEST} ]]; then
|
||||
echo -e "\n\n\n\n\e[31;1mRequired env variables not specified, likely a tag build so just failing\e[0m\n\n\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# This file info MUST match the structure of `base` in the `drone-static-upload.sh` script in
|
||||
# order to function correctly
|
||||
prefix="session-android-"
|
||||
suffix="-${DRONE_COMMIT:0:9}-universal.tar.xz"
|
||||
|
||||
# Extracting head.label using string manipulation
|
||||
echo "Extracting repo information for 'https://api.github.com/repos/${DRONE_REPO}/pulls/${DRONE_PULL_REQUEST}'"
|
||||
pr_info=$(curl -s https://api.github.com/repos/${DRONE_REPO}/pulls/${DRONE_PULL_REQUEST})
|
||||
pr_info_clean=$(echo "$pr_info" | tr -d '[:space:]')
|
||||
head_info=$(echo "$pr_info_clean" | sed -n 's/.*"head"\(.*\)"base".*/\1/p')
|
||||
fork_repo=$(echo "$head_info" | grep -o '"full_name":"[^"]*' | sed 's/"full_name":"//')
|
||||
fork_branch=$(echo "$head_info" | grep -o '"ref":"[^"]*' | sed 's/"ref":"//')
|
||||
upload_dir="https://oxen.rocks/${fork_repo}/${fork_branch}"
|
||||
|
||||
echo "Starting to poll ${upload_dir}/ every 10s to check for a build matching '${prefix}.*${suffix}'"
|
||||
|
||||
# Loop indefinitely the CI can timeout the script if it takes too long
|
||||
total_poll_duration=0
|
||||
max_poll_duration=$((30 * 60)) # Poll for a maximum of 30 mins
|
||||
|
||||
while true; do
|
||||
# Need to add the trailing '/' or else we get a '301' response
|
||||
build_artifacts_html=$(curl -s "${upload_dir}/")
|
||||
|
||||
if [ $? != 0 ]; then
|
||||
echo -e "\n\n\n\n\e[31;1mFailed to retrieve build artifact list\e[0m\n\n\n"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extract 'session-ios...' titles using grep and awk then look for the target file
|
||||
current_build_artifacts=$(echo "$build_artifacts_html" | grep -o "href=\"${prefix}[^\"]*" | sed 's/href="//')
|
||||
target_file=$(echo "$current_build_artifacts" | grep -o "${prefix}.*${suffix}" | tail -n 1)
|
||||
|
||||
if [ -n "$target_file" ]; then
|
||||
echo -e "\n\n\n\n\e[32;1mExisting build artifact at ${upload_dir}/${target_file}\e[0m\n\n\n"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Sleep for 10 seconds before checking again
|
||||
sleep 10
|
||||
total_poll_duration=$((total_poll_duration + 10))
|
||||
|
||||
if [ $total_poll_duration -gt $max_poll_duration ]; then
|
||||
echo -e "\n\n\n\n\e[31;1mCould not find existing build artifact after polling for 30 minutes\e[0m\n\n\n"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
Loading…
Reference in New Issue
Block a user