Compare commits
3 Commits
update_sdl
...
dev-b38a1a
Author | SHA1 | Date | |
---|---|---|---|
b38a1a2507 | |||
ee87dbc532 | |||
78c7ef5b46 |
20
.github/workflows/cd.yml
vendored
20
.github/workflows/cd.yml
vendored
@ -37,10 +37,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
||||||
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
||||||
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
||||||
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Compress artifacts
|
- name: Compress artifacts
|
||||||
@ -88,10 +88,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
||||||
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
||||||
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
||||||
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Compress artifacts
|
- name: Compress artifacts
|
||||||
@ -139,10 +139,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
||||||
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
||||||
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
||||||
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Compress artifacts
|
- name: Compress artifacts
|
||||||
@ -183,10 +183,10 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
SHORT_HASH="$(git rev-parse --short=7 HEAD)"
|
||||||
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
|
||||||
echo "name=${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
SAFE_NAME=$(echo "${{ env.BRANCH_NAME }}" | tr '/' '-')
|
||||||
echo "name=${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
echo "name=dev-${SAFE_NAME}-${SHORT_HASH}" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Download artifacts
|
- name: Download artifacts
|
||||||
@ -203,8 +203,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
gh release create "$tag" \
|
gh release create "$tag" \
|
||||||
--repo="$GITHUB_REPOSITORY" \
|
--repo="$GITHUB_REPOSITORY" \
|
||||||
--title="nightly ${tag#v}" \
|
--title="${tag#v}" \
|
||||||
--notes="nightly build" \
|
--notes="preview build of the latest commit" \
|
||||||
--prerelease
|
--prerelease
|
||||||
|
|
||||||
- name: Upload artifacts
|
- name: Upload artifacts
|
||||||
|
2
external/solanaceae_util
vendored
2
external/solanaceae_util
vendored
Submodule external/solanaceae_util updated: b82f039aaf...bee42d4688
@ -48,8 +48,6 @@ struct MainScreen final : public Screen {
|
|||||||
RegistryMessageModel rmm;
|
RegistryMessageModel rmm;
|
||||||
MessageTimeSort mts;
|
MessageTimeSort mts;
|
||||||
|
|
||||||
PluginManager pm;
|
|
||||||
|
|
||||||
ToxEventLogger tel{std::cout};
|
ToxEventLogger tel{std::cout};
|
||||||
ToxClient tc;
|
ToxClient tc;
|
||||||
ToxPrivateImpl tpi;
|
ToxPrivateImpl tpi;
|
||||||
@ -75,6 +73,8 @@ struct MainScreen final : public Screen {
|
|||||||
ToxUIUtils tuiu;
|
ToxUIUtils tuiu;
|
||||||
ToxDHTCapHisto tdch;
|
ToxDHTCapHisto tdch;
|
||||||
|
|
||||||
|
PluginManager pm; // last, so it gets destroyed first
|
||||||
|
|
||||||
bool _show_tool_style_editor {false};
|
bool _show_tool_style_editor {false};
|
||||||
bool _show_tool_metrics {false};
|
bool _show_tool_metrics {false};
|
||||||
bool _show_tool_debug_log {false};
|
bool _show_tool_debug_log {false};
|
||||||
|
Reference in New Issue
Block a user