diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d0d09f1173b9bb4c871a42f9bfe137d6d5bd111..5c18afa9bff259f05bc91965c7c0f9b82401ee92 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,6 @@ build-linux: # This job runs in the build stage, which runs first. - echo "Compiling the code... [linux]" - clang-15 src/lump.c src/lodepng.c src/main.c src/cJSON.c -o followermaker -lm -target x86_64-pc-linux-gnu - echo "Compile complete." - - echo "LINUXJOB_ID=$CI_JOB_ID" > linuxjob.env # Create job.env in the artifacts directory - after_script: - - cat linuxjob.env # Debug: Check the content of job.env artifacts: name: "Followermaker-linux" paths: @@ -25,8 +22,6 @@ build-linux: # This job runs in the build stage, which runs first. untracked: false when: on_success access: all - reports: - dotenv: linuxjob.env # Specify the path to the job.env file build-windows: # This job runs in the build stage, which runs first. stage: build @@ -35,9 +30,6 @@ build-windows: # This job runs in the build stage, which runs first. - echo "Compiling the code... [windows]" - clang-15 src/lump.c src/lodepng.c src/main.c src/cJSON.c -o followermaker.exe -lm --target=x86_64-w64-mingw32 --sysroot=/usr/x86_64-w64-mingw32 -L/usr/lib/gcc/x86_64-w64-mingw32/12-win32 -lgcc -lgcc_eh - echo "Compile complete." - - echo "WINDOWSJOB_ID=$CI_JOB_ID" > windowsjob.env # Create job.env in the artifacts directory - after_script: - - cat windowsjob.env # Debug: Check the content of job.env artifacts: name: "Followermaker-windows" paths: @@ -49,8 +41,6 @@ build-windows: # This job runs in the build stage, which runs first. untracked: false when: on_success access: all - reports: - dotenv: windowsjob.env # Specify the path to the job.env file release_job: stage: release @@ -61,10 +51,6 @@ release_job: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH # Run this job when commits are pushed or merged to the default branch script: - echo "Running the release job." - #- LINUXJOB_ID=$(cat linuxjob.env) # Read JOB_ID from job.env - #- echo LINUXJOB_ID - #- WINDOWSJOB_ID=$(cat windowsjob.env) # Read JOB_ID from job.env - #- echo WINDOWSJOB_ID release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties name: 'Followermaker nightly (?) r$CI_PIPELINE_IID' tag_name: 'r$CI_PIPELINE_IID' # The version is incremented per pipeline. @@ -74,5 +60,5 @@ release_job: links: - name: 'Followermaker-windows.zip' url: '$CI_SERVER_URL/$CI_PROJECT_PATH/-/jobs/artifacts/r$CI_PIPELINE_IID/download?job=build-windows' - #- name: 'Followermaker-linux.zip' - # url: '$CI_SERVER_URL/$CI_PROJECT_PATH/-/jobs/$LINUXJOB_ID/artifacts/download' \ No newline at end of file + - name: 'Followermaker-linux.zip' + url: '$CI_SERVER_URL/$CI_PROJECT_PATH/-/jobs/artifacts/r$CI_PIPELINE_IID/download?job=build-linux' \ No newline at end of file