From 5f4d4f2845a365c72d78b137f83ac77b00ca0d78 Mon Sep 17 00:00:00 2001 From: Jonah Beckford <9566106-jonahbeckford@users.noreply.gitlab.com> Date: Wed, 6 Sep 2023 08:38:10 -0700 Subject: [PATCH] Use dkml as gitlab project --- .gitlab/ci/windows-package-ocaml.gitlab-ci.yml | 2 +- contributors/index.rst | 2 +- contributors/release-prerel-delete.sh | 2 +- contributors/release.sh | 4 ++-- contributors/reupload.sh | 2 +- contributors/upload-pkgconf.sh | 2 +- contributors/upload-sqlite3.sh | 2 +- pkg/bump/CMakeLists.txt | 12 +++++++----- pkg/bump/DkMLPublish.cmake | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.gitlab/ci/windows-package-ocaml.gitlab-ci.yml b/.gitlab/ci/windows-package-ocaml.gitlab-ci.yml index 1e39ad8a..804a5192 100644 --- a/.gitlab/ci/windows-package-ocaml.gitlab-ci.yml +++ b/.gitlab/ci/windows-package-ocaml.gitlab-ci.yml @@ -50,7 +50,7 @@ win32:oorepo-fetch-1: # 4 types of bytecode (32/64 bit, Windows/Unix). - if ("${env:CI_COMMIT_TAG}" -eq "") { $PKGTAG= "$env:CI_COMMIT_BRANCH" } else { $PKGTAG = "$env:CI_COMMIT_TAG"; $PKGTAG = $PKGTAG -replace "^v" } - Invoke-WebRequest ` - -Uri "https://gitlab.com/api/v4/projects/diskuv-ocaml%2Fdistributions%2Fdkml/packages/generic/ocaml_opam_repo-support/$PKGTAG/ocaml_opam_repo_trim.bc" ` + -Uri "https://gitlab.com/api/v4/projects/dkml%2Fdistributions%2Fdkml/packages/generic/ocaml_opam_repo-support/$PKGTAG/ocaml_opam_repo_trim.bc" ` -OutFile "vendor/drd/src/ml/ocaml_opam_repo_trim.bc" # Setup and Fetch diff --git a/contributors/index.rst b/contributors/index.rst index 36ea7403..12461136 100644 --- a/contributors/index.rst +++ b/contributors/index.rst @@ -202,7 +202,7 @@ Briefly review the following: that was issued by ``Certum Code Signing CA SHA2``. -Then run the `latest Windows 64-bit installer `__. +Then run the `latest Windows 64-bit installer `__. Install is done! What next? """"""""""""""""""""""""""" diff --git a/contributors/release-prerel-delete.sh b/contributors/release-prerel-delete.sh index 21c18414..c4d98d2f 100644 --- a/contributors/release-prerel-delete.sh +++ b/contributors/release-prerel-delete.sh @@ -67,7 +67,7 @@ export GITLAB_PRIVATE_TOKEN=$($GLAB auth status -t 2>&1 | awk '$2=="Token:" {pri # Find Generic Packages # TODO: Pagination is not handled!! https://docs.gitlab.com/ee/api/index.html#pagination -PROJECT_URL='https://gitlab.com/api/v4/projects/diskuv-ocaml%2Fdistributions%2Fdkml' +PROJECT_URL='https://gitlab.com/api/v4/projects/dkml%2Fdistributions%2Fdkml' install -d _build curl --header "PRIVATE-TOKEN: $GITLAB_PRIVATE_TOKEN" "$PROJECT_URL/packages?per_page=100" | \ diff --git a/contributors/release.sh b/contributors/release.sh index 6e7e9776..5a22bea0 100644 --- a/contributors/release.sh +++ b/contributors/release.sh @@ -592,7 +592,7 @@ rungit -C "$SRC_MIXED/dkml-workflows-prerelease" push origin "$WORKFLOWS_PRERELE # ------------------------ # Remove git ignored files from submodules for distribution archive. ARCHIVE_MEMBERS -# is already a good filter for this repository (diskuv-ocaml), and we do not clean it +# is already a good filter for this repository (dkml), and we do not clean it # because we may blow away IDE settings and other build information. for v in "${ALL_VENDORS[@]}"; do git -C vendor/"$v" clean -x -d -f @@ -602,7 +602,7 @@ done # Set GitLab options CI_SERVER_URL=https://gitlab.com CI_API_V4_URL="$CI_SERVER_URL/api/v4" -CI_PROJECT_ID='diskuv-ocaml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ +CI_PROJECT_ID='dkml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ GLOBAL_OPTS=(--server-url "$CI_SERVER_URL" --project-id "$CI_PROJECT_ID") CREATE_OPTS=( --tag-name "$NEW_VERSION" diff --git a/contributors/reupload.sh b/contributors/reupload.sh index 5cb27281..40d8fc01 100644 --- a/contributors/reupload.sh +++ b/contributors/reupload.sh @@ -61,7 +61,7 @@ NEW_VERSION=$(awk '$1=="current_version"{print $NF; exit 0}' .bumpversion.prerel # Set GitLab options CI_SERVER_URL=https://gitlab.com CI_API_V4_URL="$CI_SERVER_URL/api/v4" -CI_PROJECT_ID='diskuv-ocaml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ +CI_PROJECT_ID='dkml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ # Setup Generic Packages (https://docs.gitlab.com/ee/user/packages/generic_packages/) PACKAGE_REGISTRY_GENERIC_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic" diff --git a/contributors/upload-pkgconf.sh b/contributors/upload-pkgconf.sh index bbf3a423..fdb42c8b 100644 --- a/contributors/upload-pkgconf.sh +++ b/contributors/upload-pkgconf.sh @@ -98,7 +98,7 @@ fi # Set GitLab options CI_SERVER_URL=https://gitlab.com CI_API_V4_URL="$CI_SERVER_URL/api/v4" -CI_PROJECT_ID='diskuv-ocaml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ +CI_PROJECT_ID='dkml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ # Setup Generic Packages (https://docs.gitlab.com/ee/user/packages/generic_packages/) PACKAGE_REGISTRY_GENERIC_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic" diff --git a/contributors/upload-sqlite3.sh b/contributors/upload-sqlite3.sh index b4f24bb6..29b27526 100644 --- a/contributors/upload-sqlite3.sh +++ b/contributors/upload-sqlite3.sh @@ -120,7 +120,7 @@ cd .. # Set GitLab options CI_SERVER_URL=https://gitlab.com CI_API_V4_URL="$CI_SERVER_URL/api/v4" -CI_PROJECT_ID='diskuv-ocaml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ +CI_PROJECT_ID='dkml%2Fdistributions%2Fdkml' # Must be url-encoded per https://docs.gitlab.com/ee/user/packages/generic_packages/ # Setup Generic Packages (https://docs.gitlab.com/ee/user/packages/generic_packages/) PACKAGE_REGISTRY_GENERIC_URL="$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic" diff --git a/pkg/bump/CMakeLists.txt b/pkg/bump/CMakeLists.txt index b56d922a..491044a4 100644 --- a/pkg/bump/CMakeLists.txt +++ b/pkg/bump/CMakeLists.txt @@ -1172,14 +1172,16 @@ function(add_Installer_target) anyrun(${opamsw}/upsert-installer.sh upsert_installer_COMMAND) - set(byproducts bundle-diskuv-ocaml-generic-i.sh bundle-diskuv-ocaml-generic-u.sh) - set(byproducts_byte ${byproducts}) - set(byproducts_native ${byproducts}) + set(byproducts) + set(byproducts_byte ${byproducts} + bundle-dkml-byte-generic-i.sh bundle-dkml-byte-generic-u.sh) + set(byproducts_native ${byproducts} + bundle-dkml-native-generic-i.sh bundle-dkml-native-generic-u.sh) if(DKML_TARGET_ABI STREQUAL windows_x86 OR DKML_TARGET_ABI STREQUAL windows_x86_64) list(APPEND byproducts_byte - unsigned-dkml-lite-${DKML_TARGET_ABI}-i-${DKML_VERSION_SEMVER_NEW_${BUMP_LEVEL}}.exe - unsigned-dkml-lite-${DKML_TARGET_ABI}-u-${DKML_VERSION_SEMVER_NEW_${BUMP_LEVEL}}.exe) + unsigned-dkml-byte-${DKML_TARGET_ABI}-i-${DKML_VERSION_SEMVER_NEW_${BUMP_LEVEL}}.exe + unsigned-dkml-byte-${DKML_TARGET_ABI}-u-${DKML_VERSION_SEMVER_NEW_${BUMP_LEVEL}}.exe) list(APPEND byproducts_native unsigned-dkml-native-${DKML_TARGET_ABI}-i-${DKML_VERSION_SEMVER_NEW_${BUMP_LEVEL}}.exe unsigned-dkml-native-${DKML_TARGET_ABI}-u-${DKML_VERSION_SEMVER_NEW_${BUMP_LEVEL}}.exe) diff --git a/pkg/bump/DkMLPublish.cmake b/pkg/bump/DkMLPublish.cmake index aa0a6ea2..1be9b478 100644 --- a/pkg/bump/DkMLPublish.cmake +++ b/pkg/bump/DkMLPublish.cmake @@ -3,7 +3,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/DkMLAnyRun.cmake) include(${CMAKE_CURRENT_LIST_DIR}/DkMLBumpLevels.cmake) # Aka. https://gitlab.com/dkml/distributions/dkml -set(GITLAB_UPLOAD_BASE_URL https://gitlab.com/api/v4/projects/diskuv-ocaml%2Fdistributions%2Fdkml) +set(GITLAB_UPLOAD_BASE_URL https://gitlab.com/api/v4/projects/dkml%2Fdistributions%2Fdkml) set(PUBLISHDIR ${CMAKE_CURRENT_BINARY_DIR}/Publish) set(glab_HINTS)