From 173b6d6dd076f2e7a4210d32dde6c3442051abc6 Mon Sep 17 00:00:00 2001 From: belliash Date: Mon, 27 Mar 2023 23:17:30 +0200 Subject: [PATCH 01/15] Enable control flow guard and fix LLVM compilation --- build-linux.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/build-linux.sh b/build-linux.sh index e04747b..658ed3b 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -267,7 +267,7 @@ llvm_build_runtime() -DCMAKE_FIND_ROOT_PATH="${BINDIR}/${ARCH}-w64-mingw32" \ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY \ - -DCMAKE_INSTALL_PREFIX=${BINDIR}/lib/clang/${LLVMTAG##*-} \ + -DCMAKE_INSTALL_PREFIX=$(${BINDIR}/bin/${ARCH}-w64-mingw32-clang --print-resource-dir) \ -DCMAKE_RANLIB="${BINDIR}/bin/llvm-ranlib" \ -DCMAKE_SYSTEM_NAME="Windows" \ -DCOMPILER_RT_BUILD_BUILTINS=TRUE \ @@ -361,6 +361,7 @@ mingw_build_crt() --prefix=${BINDIR}/${ARCH}-w64-mingw32 \ --with-sysroot=${BINDIR} \ --with-default-msvcrt=${MINGWLIB} \ + --enable-cfguard \ ${FLAGS} make -j${CORES} make install @@ -406,7 +407,9 @@ mingw_build_libs() ../configure \ --host=${ARCH}-w64-mingw32 \ --prefix=${BINDIR}/${ARCH}-w64-mingw32 \ - --libdir=${BINDIR}/${ARCH}-w64-mingw32/lib + --libdir=${BINDIR}/${ARCH}-w64-mingw32/lib \ + CFLAGS="-O2 -mguard=cf" \ + CXXFLAGS="-O2 -mguard=cf" make -j${CORES} make install PATH="${ORIGPATH}" @@ -565,12 +568,6 @@ llvm_fetch # Build and install LLVM llvm_build -# Download Binutils -binutils_fetch - -# Build and install Binutils -binutils_build - # Download Mingw-W64 mingw_fetch @@ -592,6 +589,12 @@ mingw_build_libs # Build and install Mingw-W64 tools mingw_build_tools +# Download Binutils +binutils_fetch + +# Build and install Binutils +binutils_build + # Download Wine wine_fetch @@ -619,7 +622,7 @@ ninja_build # Remove unneeded files to save disk space echo ">>> Removing unneeded files to save disk space ..." rm -rf ${BINDIR}/{doc,include,share/{bash-completion,emacs,info,locale,man,vim}} -rm -rf ${BINDIR}/bin/{clang-{check,exdef-mapping,import-test,offload-*,rename,scan-deps},hmaptool,ld64.lld,wasm-ld} +rm -rf ${BINDIR}/bin/amdgpu-arch,{clang-{check,exdef-mapping,import-test,offload-*,rename,scan-deps},diagtool,hmaptool,ld64.lld,modularize,nxptx-arch,wasm-ld} # Save XT Toolchain version cd ${WRKDIR} From b65a92d147ae63030f6ccd858845d09df01620d7 Mon Sep 17 00:00:00 2001 From: belliash Date: Tue, 28 Mar 2023 16:00:15 +0200 Subject: [PATCH 02/15] Add accidentally removed ninja_build() function --- build-linux.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/build-linux.sh b/build-linux.sh index 658ed3b..6a2caca 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -455,14 +455,15 @@ mingw_fetch() fi } -# This function compiles and installs NASM -nasm_build() +# This function compiles and installs NINJA +ninja_build() { - cd ${NASMDIR} - ./autogen.sh - ./configure - make -j${CORES} - install nasm ndisasm ${BINDIR}/bin/ + echo ">>> Building NINJA ..." + [ -z ${CLEAN} ] || rm -rf ${NINJADIR}/build-${GENERIC} + mkdir -p ${NINJADIR}/build-${GENERIC} + cd ${NINJADIR}/build-${GENERIC} + ../configure.py --bootstrap + install ninja ${BINDIR}/bin/ cd ${WRKDIR} } From 37e38daf36844229c67dff590e3c98a14255a8f0 Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 29 Mar 2023 22:42:25 +0200 Subject: [PATCH 03/15] Update versioning strategy --- build-linux.sh | 2 +- scripts/xtclib | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-linux.sh b/build-linux.sh index 6a2caca..4c079a4 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -628,7 +628,7 @@ rm -rf ${BINDIR}/bin/amdgpu-arch,{clang-{check,exdef-mapping,import-test,offload # Save XT Toolchain version cd ${WRKDIR} : ${XTCVER:=$(git describe --exact-match --tags 2>/dev/null)} -: ${XTCVER:=DEV} +: ${XTCVER:=DEVEL} echo "${XTCVER}" > ${BINDIR}/Version # Prepare archive diff --git a/scripts/xtclib b/scripts/xtclib index b61f489..2daa02c 100755 --- a/scripts/xtclib +++ b/scripts/xtclib @@ -55,7 +55,7 @@ export -f chbuild version() { echo "###############################################################################" - echo "# XT Toolchain v${XTCVER} for Linux #" + echo "# XT Toolchain v${XTCVER} for Linux #" echo "# by Rafal Kupiec #" echo "###############################################################################" echo From 14f2f7cf1fc8c16cfec6aa8ed959deea7a82ac64 Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 29 Mar 2023 22:43:20 +0200 Subject: [PATCH 04/15] Update used software list --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8db7289..fa6815d 100644 --- a/README.md +++ b/README.md @@ -31,10 +31,10 @@ Benefits of a LLVM based MinGW toolchain are: This software includes: * CMake + * GNU Assembler * LLVM * Make * Mingw-w64 - * NASM * Ninja * Wine From 5684623164134bde72e75ffaa35259546d55f20c Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 17 May 2023 15:17:58 +0200 Subject: [PATCH 05/15] Upgrade LLVM and rewrite exetool in C --- build-linux.sh | 5 +- scripts/exetool | 79 --------------------------- tools/exetool.c | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 144 insertions(+), 82 deletions(-) delete mode 100755 scripts/exetool create mode 100644 tools/exetool.c diff --git a/build-linux.sh b/build-linux.sh index 4c079a4..5179fc8 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -28,7 +28,7 @@ CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git" # LLVM Settings LLVMDIR="${SRCDIR}/llvm" -LLVMTAG="llvmorg-16.0.0" +LLVMTAG="llvmorg-16.0.4" LLVMVCS="https://github.com/llvm/llvm-project.git" # Make Settings @@ -533,14 +533,13 @@ xtchain_build() for EXEC in dlltool ld objdump; do ln -sf ../${GENERIC}/bin/${EXEC}-wrapper ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC} done - for EXEC in windres xtcspecc; do + for EXEC in exetool windres xtcspecc; do if [ ! -e ${BINDIR}/bin/${EXEC} ]; then gcc ${WRKDIR}/tools/${EXEC}.c -o ${BINDIR}/bin/${EXEC} fi ln -sf ${EXEC} ${BINDIR}/bin/${ARCH}-w64-mingw32-${EXEC} done done - cp ${WRKDIR}/scripts/exetool ${BINDIR}/bin/ cp ${WRKDIR}/scripts/xtclib ${BINDIR}/lib/xtchain/ cp ${WRKDIR}/scripts/xtchain ${BINDIR}/ } diff --git a/scripts/exetool b/scripts/exetool deleted file mode 100755 index 732d501..0000000 --- a/scripts/exetool +++ /dev/null @@ -1,79 +0,0 @@ -#!/usr/bin/env python3 - -import sys -import struct - -if len(sys.argv) < 3: - print("XTChain ExeTool for modifying PE/COFF image subsystem\nNot sufficient parametrs. '[PE/COFF Image File]' '[SubSystem]'") - sys.exit(1) - -ImageFile = sys.argv[1] -Subsystem = sys.argv[2].upper() - -# Set proper subsystem -if Subsystem == "UNKNOWN": - ImageSubsystem = 0x00 -elif Subsystem == "NT_NATIVE": - ImageSubsystem = 0x01 -elif Subsystem == "WINDOWS_GUI": - ImageSubsystem = 0x02 -elif Subsystem == "WINDOWS_CLI": - ImageSubsystem = 0x03 -elif Subsystem == "WINDOWS_CE_OLD": - ImageSubsystem = 0x04 -elif Subsystem == "OS2_CUI": - ImageSubsystem = 0x05 -elif Subsystem == "POSIX_CUI": - ImageSubsystem = 0x07 -elif Subsystem == "NATIVE_WINDOWS": - ImageSubsystem = 0x08 -elif Subsystem == "WINDOWS_CE_GUI": - ImageSubsystem = 0x09 -elif Subsystem == "EFI_APPLICATION": - ImageSubsystem = 0x0A -elif Subsystem == "EFI_BOOT_SERVICE_DRIVER": - ImageSubsystem = 0x0B -elif Subsystem == "EFI_RUNTIME_DRIVER": - ImageSubsystem = 0x0C -elif Subsystem == "EFI_ROM": - ImageSubsystem = 0x0D -elif Subsystem == "XBOX": - ImageSubsystem = 0x0E -elif Subsystem == "WINDOWS_BOOT_APPLICATION": - ImageSubsystem = 0x10 -elif Subsystem == "XT_NATIVE_KERNEL": - ImageSubsystem = 0x14 -elif Subsystem == "XT_NATIVE_APPLICATION": - ImageSubsystem = 0x15 -elif Subsystem == "XT_NATIVE_DRIVER": - ImageSubsystem = 0x16 -elif Subsystem == "XT_DYNAMIC_LIBRARY": - ImageSubsystem = 0x17 -elif Subsystem == "XT_APPLICATION_CLI": - ImageSubsystem = 0x18 -elif Subsystem == "XT_APPLICATION_GDI": - ImageSubsystem = 0x19 -else: - print("Invalid subsystem privided") - exit(2) - -# Open PE/COFF image file -PeImage = open(sys.argv[1], "r+b") - -# Get PE header -PeImage.seek(0x3C) -(PeHeader,)=struct.unpack("H", PeImage.read(2)) - -# Get PE signature -PeImage.seek(PeHeader) -(PeSignature,)=struct.unpack("I", PeImage.read(4)) -if PeSignature != 0x4550: - print("Invalid or corrupted PE header") - -# Set new image subsystem -PeImage.seek(PeHeader + 0x5C) -print("Setting subsystem to " + str(ImageSubsystem)) -PeImage.write(struct.pack("H", ImageSubsystem)) - -# Close PE/COFF image file -PeImage.close() diff --git a/tools/exetool.c b/tools/exetool.c new file mode 100644 index 0000000..93a4577 --- /dev/null +++ b/tools/exetool.c @@ -0,0 +1,142 @@ +/** + * PROJECT: XTchain + * LICENSE: See COPYING.md in the top level directory + * FILE: tools/exetool.c + * DESCRIPTION: Portable Executable (PE) utility for changing subsystem + * DEVELOPERS: Rafal Kupiec + */ + +#include "xtchain.h" + +typedef struct _PE_SUBSYSTEM +{ + int Identifier; + char *Name; +} PE_SUBSYSTEM, *PPE_SUBSYSTEM; + +static PE_SUBSYSTEM SubSystems[] = { + {0x01, "NT_NATIVE"}, + {0x02, "WINDOWS_GUI"}, + {0x03, "WINDOWS_CLI"}, + {0x04, "WINDOWS_CE_OLD"}, + {0x05, "OS2_CUI"}, + {0x07, "POSIX_CUI"}, + {0x08, "NATIVE_WINDOWS"}, + {0x09, "WINDOWS_CE_GUI"}, + {0x0A, "EFI_APPLICATION"}, + {0x0B, "EFI_BOOT_SERVICE_DRIVER"}, + {0x0C, "EFI_RUNTIME_DRIVER"}, + {0x0D, "EFI_ROM"}, + {0x0E, "XBOX"}, + {0x10, "WINDOWS_BOOT_APPLICATION"}, + {0x14, "XT_NATIVE_KERNEL"}, + {0x15, "XT_NATIVE_APPLICATION"}, + {0x16, "XT_NATIVE_DRIVER"}, + {0x17, "XT_DYNAMIC_LIBRARY"}, + {0x18, "XT_APPLICATION_CLI"}, + {0x19, "XT_APPLICATION_GDI"} +}; + +int getSubSystemID(char *Name) +{ + int Index; + int SubSystemsCount; + PPE_SUBSYSTEM SubSystem; + + /* Count number of subsystems avaialble */ + SubSystemsCount = sizeof(SubSystems) / sizeof(PE_SUBSYSTEM); + + /* Find subsystem */ + for(Index = 0; Index < SubSystemsCount; Index++) + { + SubSystem = &SubSystems[Index]; + if(strcmp(SubSystem->Name, Name) == 0) + { + /* Subsystem found, return its ID */ + return SubSystem->Identifier; + } + } + + /* No valid subsystem found */ + return 0x00; +} + +int main(int argc, char *argv[]) +{ + FILE *ExeFile; + unsigned char Signature[4]; + unsigned int HeaderOffset; + unsigned short SubSystem; + int NewSubSystem; + + /* Check for proper number of arguments */ + if(argc != 3) + { + printf("Usage: %s \n", argv[0]); + return 1; + } + + /* Open the EXE file in binary mode */ + ExeFile = fopen(argv[1], "r+b"); + if(ExeFile == NULL) + { + /* Failed to open PE file */ + printf("ERROR: Unable to open file %s\n", argv[1]); + return 1; + } + + /* Verify that the input file has a valid DOS header */ + fread(Signature, sizeof(unsigned char), 4, ExeFile); + if(Signature[0] != 'M' || Signature[1] != 'Z') + { + /* Invalid DOS header */ + printf("ERROR: %s is not a valid EXE file\n", argv[1]); + fclose(ExeFile); + return 1; + } + + /* Verify that the input file has a valid PE header */ + fseek(ExeFile, 0x3C, SEEK_SET); + fread(&HeaderOffset, sizeof(unsigned int), 1, ExeFile); + fseek(ExeFile, HeaderOffset, SEEK_SET); + fread(Signature, sizeof(unsigned char), 4, ExeFile); + if(Signature[0] != 'P' || Signature[1] != 'E' || Signature[2] != 0 || Signature[3] != 0) + { + /* Invalid PE header */ + printf("Error: %s is not a valid PE file\n", argv[1]); + fclose(ExeFile); + return 1; + } + + /* Seek to the offset of the SubSystem field in the optional header */ + fseek(ExeFile, HeaderOffset + 0x5C, SEEK_SET); + + /* Read the current SubSystem value */ + fread(&SubSystem, sizeof(unsigned short), 1, ExeFile); + printf("Original SubSystem: 0x%04X\n", SubSystem); + + /* Parse the new SubSystem value from the command line argument */ + NewSubSystem = getSubSystemID(argv[2]); + if(NewSubSystem == 0) + { + /* Invalid SubSystem provided */ + printf("Error: %s is not a valid PE SubSystem\n", argv[2]); + return 1; + } + + /* Print new SubSystem identifier */ + printf("New SubSystem: 0x%04X\n", NewSubSystem); + + /* Seek back to the SubSystem field in the optional header */ + fseek(ExeFile, -sizeof(unsigned short), SEEK_CUR); + + /* Write the new SubSystem value */ + fwrite(&NewSubSystem, sizeof(unsigned short), 1, ExeFile); + + /* Close the file */ + fclose(ExeFile); + + /* Finished successfully */ + printf("SubSystem successfully modified!\n"); + return 0; +} From 0e49773bf4e44854e052acd19b8e7305f15fe843 Mon Sep 17 00:00:00 2001 From: belliash Date: Sat, 3 Jun 2023 09:47:03 +0200 Subject: [PATCH 06/15] Upgrade LLVM to 16.0.5 --- build-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-linux.sh b/build-linux.sh index 5179fc8..7367f23 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -28,7 +28,7 @@ CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git" # LLVM Settings LLVMDIR="${SRCDIR}/llvm" -LLVMTAG="llvmorg-16.0.4" +LLVMTAG="llvmorg-16.0.5" LLVMVCS="https://github.com/llvm/llvm-project.git" # Make Settings From 7fb22270343a545bbe18574e95b2107503566fa7 Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 21 Jun 2023 21:33:02 +0200 Subject: [PATCH 07/15] Update LLVM to 16.0.6 --- build-linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-linux.sh b/build-linux.sh index 7367f23..1c933a4 100755 --- a/build-linux.sh +++ b/build-linux.sh @@ -28,7 +28,7 @@ CMAKEVCS="https://gitlab.kitware.com/cmake/cmake.git" # LLVM Settings LLVMDIR="${SRCDIR}/llvm" -LLVMTAG="llvmorg-16.0.5" +LLVMTAG="llvmorg-16.0.6" LLVMVCS="https://github.com/llvm/llvm-project.git" # Make Settings From f1f31583ff7054f3b7272ba9e33880a276d1b1af Mon Sep 17 00:00:00 2001 From: belliash Date: Sun, 26 Mar 2023 20:32:49 +0200 Subject: [PATCH 08/15] Initial version of Gitea Actions --- .build.yml | 14 -------------- .github/workflows/build.yml | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 14 deletions(-) delete mode 100644 .build.yml create mode 100644 .github/workflows/build.yml diff --git a/.build.yml b/.build.yml deleted file mode 100644 index 8d74cd1..0000000 --- a/.build.yml +++ /dev/null @@ -1,14 +0,0 @@ -pipeline: - build: - image: codingworkshop/oscw-runner:latest - commands: - - CORES=10 ./build-linux.sh - publish: - image: codingworkshop/oscw-runner:latest - secrets: - - OSCW_GITHUB_USERNAME - - OSCW_GITHUB_PASSWORD - when: - event: tag - commands: - - github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..db40ecb --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,23 @@ +name: Builds +on: + push: + branches: + - '**' + +jobs: + xtchain: + runs-on: oscw + container: + image: codingworkshop/oscw-runner:latest + steps: + - name: Build + run: CORES=10 ./build-linux.sh + - name: Publish + on: + push: + tags: + - '**' + env: + OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} + OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} + run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) From a47adab24136eb4b300355579b7b06e3dad128f6 Mon Sep 17 00:00:00 2001 From: belliash Date: Sun, 26 Mar 2023 20:41:48 +0200 Subject: [PATCH 09/15] Test runner --- .github/workflows/build.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db40ecb..c130146 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,18 +1,21 @@ name: Builds -on: - push: - branches: - - '**' +run-name: ${{ github.actor }} testing Gitea Actions +on: [push] jobs: - xtchain: + XTChain: runs-on: oscw container: image: codingworkshop/oscw-runner:latest steps: - - name: Build + - run: echo "The job was automatically triggered by a ${{ github.event_name }} event." + - run: echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!" + - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." + - name: Checkout repository + uses: actions/checkout@v3 + - name: Build XTChain run: CORES=10 ./build-linux.sh - - name: Publish + - name: Publish binaries on: push: tags: @@ -21,3 +24,4 @@ jobs: OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) + - run: echo "This job's status is ${{ job.status }}." From fe3c1215bd532042d8a050625703fb6d1f56ecf6 Mon Sep 17 00:00:00 2001 From: belliash Date: Sun, 26 Mar 2023 20:46:03 +0200 Subject: [PATCH 10/15] Cleanup a bit --- .github/workflows/build.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c130146..c9e121f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,11 +8,8 @@ jobs: container: image: codingworkshop/oscw-runner:latest steps: - - run: echo "The job was automatically triggered by a ${{ github.event_name }} event." - - run: echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!" - - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}." - - name: Checkout repository - uses: actions/checkout@v3 +# - name: Checkout repository +# uses: actions/checkout@v3 - name: Build XTChain run: CORES=10 ./build-linux.sh - name: Publish binaries @@ -24,4 +21,3 @@ jobs: OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) - - run: echo "This job's status is ${{ job.status }}." From a5883d620b01820b047cf11427a155f24b724d08 Mon Sep 17 00:00:00 2001 From: belliash Date: Sun, 26 Mar 2023 20:47:09 +0200 Subject: [PATCH 11/15] Add checkout step again --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c9e121f..cf65f1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,8 +8,8 @@ jobs: container: image: codingworkshop/oscw-runner:latest steps: -# - name: Checkout repository -# uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v3 - name: Build XTChain run: CORES=10 ./build-linux.sh - name: Publish binaries From 0fe6b3376e6a006a25e1fec8bb12b852270d6363 Mon Sep 17 00:00:00 2001 From: belliash Date: Mon, 27 Mar 2023 20:43:16 +0200 Subject: [PATCH 12/15] Test just build step --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf65f1e..283e85e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,12 +12,12 @@ jobs: uses: actions/checkout@v3 - name: Build XTChain run: CORES=10 ./build-linux.sh - - name: Publish binaries - on: - push: - tags: - - '**' - env: - OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} - OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} - run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) +# - name: Publish binaries +# on: +# push: +# tags: +# - '**' +# env: +# OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} +# OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} +# run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) From e22f9afd5882e2f2efa894d86ae440b80d3abdae Mon Sep 17 00:00:00 2001 From: belliash Date: Sun, 25 Jun 2023 17:31:29 +0200 Subject: [PATCH 13/15] Enable publish stage --- .github/workflows/build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 283e85e..cf65f1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,12 +12,12 @@ jobs: uses: actions/checkout@v3 - name: Build XTChain run: CORES=10 ./build-linux.sh -# - name: Publish binaries -# on: -# push: -# tags: -# - '**' -# env: -# OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} -# OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} -# run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) + - name: Publish binaries + on: + push: + tags: + - '**' + env: + OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} + OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} + run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) From 065b9473781d01dded482987d08420ef77100978 Mon Sep 17 00:00:00 2001 From: belliash Date: Mon, 10 Jul 2023 20:50:23 +0200 Subject: [PATCH 14/15] Enable publish stage --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf65f1e..c239c24 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,4 +20,4 @@ jobs: env: OSCW_GITHUB_USERNAME: ${{ secrets.OSCW_GITHUB_USERNAME }} OSCW_GITHUB_PASSWORD: ${{ secrets.OSCW_GITHUB_PASSWORD }} - run: github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) + run: ls -la; github_publish $OSCW_GITHUB_USERNAME $OSCW_GITHUB_PASSWORD $(ls xtchain-*-linux.tar.zst) From 5d31e4026e081ce58ef1fffb4405db33eceac20d Mon Sep 17 00:00:00 2001 From: belliash Date: Tue, 11 Jul 2023 19:34:08 +0200 Subject: [PATCH 15/15] Print environmental variables --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c239c24..525d5ee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v3 - name: Build XTChain - run: CORES=10 ./build-linux.sh + run: env; exit 0; CORES=10 ./build-linux.sh - name: Publish binaries on: push: